Merge branch 'master' into m_savard

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/src/config/configwindow.c

sflphone-client-gnome/src/contacts/calltree.c

sflphone-client-gnome/src/sflnotify.c

sflphone-client-gnome/src/sflnotify.h

sflphone-client-gnome/src/sflphone_const.h

sflphone-common/Makefile.am

sflphone-common/configure.ac

sflphone-common/debian/changelog

sflphone-common/debian/control.hardy

sflphone-common/debian/control.intrepid

sflphone-common/debian/control.jaunty

sflphone-common/po/de.po

sflphone-common/po/es.po

sflphone-common/po/ru.po