Merge branch 'master' into im

sflphone-client-gnome/Makefile.am

sflphone-client-gnome/configure.ac

sflphone-client-gnome/sflphone-client-gnome.schemas

sflphone-client-gnome/src/Makefile.am

sflphone-client-gnome/src/config/audioconf.c

sflphone-client-gnome/src/config/preferencesdialog.c

sflphone-client-gnome/src/contacts/calllist.c

sflphone-client-gnome/src/contacts/calltree.c

sflphone-client-gnome/src/dbus/dbus.c

sflphone-client-gnome/src/dbus/dbus.h

sflphone-client-gnome/src/eel-gconf-extensions.c

sflphone-client-gnome/src/eel-gconf-extensions.h

sflphone-client-gnome/src/main.c

sflphone-client-gnome/src/mainwindow.c

sflphone-client-gnome/src/sflnotify.c

sflphone-client-gnome/src/sflphone_const.h

sflphone-client-gnome/src/statusicon.c

sflphone-client-gnome/src/uimanager.c