Merge branch 'master' into jbonjean

sflphone-client-gnome/Makefile.am

sflphone-client-gnome/pixmaps/incoming.svg

sflphone-client-gnome/pixmaps/outgoing.svg

sflphone-client-gnome/sflphone.desktop.in

sflphone-client-gnome/src/accountlist.c

sflphone-client-gnome/src/accountlist.h

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/actions.h

sflphone-client-gnome/src/callable_obj.c

sflphone-client-gnome/src/callable_obj.h

sflphone-client-gnome/src/conference_obj.c

sflphone-client-gnome/src/conference_obj.h

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

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

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

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

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

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

...-client-gnome/src/dbus/configurationmanager-introspec.xml

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