Merge branch 'master' into release

.gitignore

configure.ac

debian/control.intrepid

debian/control.jaunty

libs/dbus-c++/src/eventloop.cpp

libs/libiax2/iax2-config.in

po/fr.po

sflphone-gtk/configure.ac

sflphone-gtk/pixmaps/Makefile.am

sflphone-gtk/pixmaps/addressbook.svg

sflphone-gtk/pixmaps/contact_default.svg

sflphone-gtk/pixmaps/face-monkey.svg

sflphone-gtk/pixmaps/home.svg

sflphone-gtk/pixmaps/users.svg

sflphone-gtk/pixmaps/wait-off.gif

sflphone-gtk/pixmaps/wait-on.gif

sflphone-gtk/src/Makefile.am

sflphone-gtk/src/actions.c

sflphone-gtk/src/addressbook-config.c

sflphone-gtk/src/addressbook-config.h