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

daemon/src/dbus/callmanager-introspec.xml

daemon/src/managerimpl.cpp

gnome/src/actions.c

gnome/src/callable_obj.c

gnome/src/callable_obj.h

gnome/src/codeclist.c

gnome/src/conference_obj.c

gnome/src/config/accountconfigdialog.c

gnome/src/config/accountlistconfigdialog.c

gnome/src/config/addressbook-config.c

gnome/src/config/assistant.c

gnome/src/config/audioconf.c

gnome/src/contacts/calllist.c

gnome/src/contacts/calllist.h

gnome/src/contacts/calltree.c

gnome/src/dbus/callmanager-introspec.xml

gnome/src/dbus/dbus.c

gnome/src/main.c

gnome/src/mainwindow.c