merge conflict

.gitignore

configure.ac

debian/control.intrepid

debian/control.jaunty

libs/libiax2/iax2-config.in

po/fr.po

sflphone-gtk/pixmaps/Makefile.am

sflphone-gtk/pixmaps/wait-off.gif

sflphone-gtk/pixmaps/wait-on.gif

sflphone-gtk/src/actions.c

sflphone-gtk/src/calllist.h

sflphone-gtk/src/calltab.c

sflphone-gtk/src/calltab.h

sflphone-gtk/src/calltree.c

sflphone-gtk/src/calltree.h

sflphone-gtk/src/configwindow.c

sflphone-gtk/src/contactlist/eds.c

sflphone-gtk/src/contactlist/eds.h

sflphone-gtk/src/dbus.c

sflphone-gtk/src/mainwindow.c