Merge branch 'master' into m_savard

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/callable_obj.c

sflphone-client-gnome/src/codeclist.c

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

sflphone-client-gnome/src/contacts/addressbook/eds.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/imwindow.c

sflphone-client-gnome/src/sflnotify.c

sflphone-client-gnome/src/uimanager.c

sflphone-client-gnome/src/widget/imwidget.c

sflphone-client-gnome/src/widget/imwidget.h