Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

gnome/configure.ac

gnome/src/Makefile.am

gnome/src/config/accountconfigdialog.c

gnome/src/config/accountlistconfigdialog.c

gnome/src/config/addressbook-config.c

gnome/src/config/assistant.c

gnome/src/config/audioconf.c

gnome/src/config/hooks-config.c

gnome/src/config/preferencesdialog.c

gnome/src/config/shortcuts-config.c

gnome/src/config/tlsadvanceddialog.c

gnome/src/contacts/calltree.c

gnome/src/contacts/searchbar.c

gnome/src/gtk2_wrappers.c

gnome/src/gtk2_wrappers.h

gnome/src/imwindow.c

gnome/src/mainwindow.c

gnome/src/sliders.c

gnome/src/uimanager.c

gnome/src/widget/minidialog.c