Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

daemon/src/account.cpp

daemon/src/iax/iaxaccount.cpp

daemon/src/managerimpl.cpp

daemon/src/managerimpl.h

daemon/src/sip/sipaccount.cpp

daemon/test/resamplertest.cpp

daemon/test/resamplertest.h

gnome/src/contacts/calltab.c

gnome/src/contacts/conferencelist.c

kde/src/SFLPhoneView.cpp

kde/src/klib/HelperFunctions.cpp

kde/src/klib/dataengine/sflphonEngine.cpp

kde/src/klib/dataengine/sflphonEngine.h

kde/src/klib/dataengine/sflphone.operations

kde/src/klib/dataengine/sflphoneService.cpp

kde/src/klib/dataengine/sflphoneService.h

kde/src/lib/Contact.cpp