Merge branch 'master' into earlymedia

hudson-sflphone-script.sh

sflphone-client-gnome/configure.ac

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

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/codeclist.c

sflphone-client-gnome/src/codeclist.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/accountconfigdialog.h

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

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

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

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