Merge branch 'master' into jbonjean

.gitignore

sflphone-client-gnome/debian/changelog

sflphone-client-gnome/debian/control.hardy

sflphone-client-gnome/debian/control.intrepid

sflphone-client-gnome/debian/control.jaunty

sflphone-client-gnome/pixmaps/Makefile.am

sflphone-client-gnome/pixmaps/sflphone_small.svg

sflphone-client-gnome/sflphone.desktop.in

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/config/configwindow.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/sflnotify.c

sflphone-client-gnome/src/sflnotify.h

sflphone-client-gnome/src/sflphone_const.h

sflphone-client-kde/AUTHORS

sflphone-client-kde/Account.cpp

sflphone-client-kde/Account.h

sflphone-client-kde/AccountItemWidget.cpp