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

daemon/src/config/yamlnode.cpp

daemon/src/config/yamlparser.cpp

daemon/src/dbus/callmanager-introspec.xml

daemon/src/dbus/callmanager.cpp

daemon/src/dbus/callmanager.h

daemon/src/managerimpl.cpp

daemon/src/managerimpl.h

gnome/src/actions.c

gnome/src/callable_obj.c

gnome/src/callable_obj.h

gnome/src/conference_obj.c

gnome/src/contacts/calltab.c

gnome/src/contacts/calltree.c

gnome/src/contacts/calltree.h

gnome/src/dbus/callmanager-introspec.xml

gnome/src/dbus/dbus.c

gnome/src/dbus/dbus.h

gnome/src/uimanager.c