Merge branch 'master' into jbonjean

sflphone-client-gnome/Makefile.am

sflphone-client-gnome/config.h.in

sflphone-client-gnome/configure.ac

sflphone-client-gnome/doc/C/figures/account_advanced.png

sflphone-client-gnome/doc/C/figures/account_registration.png

sflphone-client-gnome/doc/C/sflphone.xml

sflphone-client-gnome/doc/Makefile.am

sflphone-client-gnome/globals.mak

sflphone-client-gnome/pixmaps/Makefile.am

sflphone-client-gnome/src/Makefile.am

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/callable_obj.c

sflphone-client-gnome/src/callable_obj.h

sflphone-client-gnome/src/conference_obj.h

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

sflphone-client-gnome/src/contacts/addressbook.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/icons/Makefile