Merge branch 'master' into contact_list

configure.ac

debian/changelog

debian/control.intrepid

debian/control.jaunty

debian/rules

libs/dbus-c++/INSTALL

libs/dbus-c++/depcomp

libs/dbus-c++/install-sh

libs/dbus-c++/missing

libs/libiax2/INSTALL

libs/libiax2/iax2-config.in

po/fr.po

sflphone-gtk/.cproject

sflphone-gtk/.project

sflphone-gtk/.settings/org.eclipse.cdt.core.prefs

sflphone-gtk/.settings/org.eclipse.cdt.ui.prefs

...hone-gtk/.settings/org.eclipse.ltk.core.refactoring.prefs

sflphone-gtk/configure.ac

sflphone-gtk/src/Makefile.am

sflphone-gtk/src/actions.c