Merge branch 'master' into qt-client

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/history.svg

sflphone-client-gnome/pixmaps/sflphone.png

sflphone-client-gnome/pixmaps/sflphone.svg

sflphone-client-gnome/pixmaps/sflphone_notif.svg

sflphone-client-gnome/pixmaps/sflphone_small.svg

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

sflphone-client-gnome/src/assistant.h

sflphone-client-gnome/src/codeclist.c

sflphone-client-gnome/src/config/Makefile.am

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

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