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/src/sip/sipvoiplink.cpp

daemon/test/resamplertest.cpp

daemon/test/resamplertest.h

gnome/src/contacts/addrbookfactory.c

gnome/src/contacts/calltree.c

gnome/src/contacts/conferencelist.c

gnome/src/dbus/configurationmanager-introspec.xml

gnome/src/dbus/dbus.c

gnome/src/sliders.c

gnome/src/uimanager.c