Merge branch 'master' into jbonjean

AUTHORS

sflphone-client-gnome/sflphone.desktop.in

sflphone-client-gnome/src/Makefile.am

sflphone-client-gnome/src/dbus/dbus.c

sflphone-client-kde/CMakeLists.txt

sflphone-client-kde/INSTALL

sflphone-client-kde/README

sflphone-client-kde/cmake/FindKabc.cmake

sflphone-client-kde/cmake/FindQt4.cmake

sflphone-client-kde/cmake/TargetDistclean.cmake

sflphone-client-kde/config.sh

sflphone-client-kde/data/CMakeLists.txt

sflphone-client-kde/data/sflphone-client-kde.desktop

sflphone-client-kde/data/sflphone-client-kdeui.rc

sflphone-client-kde/doc/CMakeLists.txt

sflphone-client-kde/doc/basic-use.docbook

sflphone-client-kde/install.sh

sflphone-client-kde/po/sflphone-client-kde.pot

sflphone-client-kde/po/sflphone-client-kde_fr.po

sflphone-client-kde/resources.qrc