Merge branch 'master' of...

sflphone-client-gnome/pixmaps/Makefile.am

sflphone-client-gnome/pixmaps/usersActive.svg

sflphone-client-gnome/src/Makefile.am

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/actions.h

sflphone-client-gnome/src/conference_obj.c

sflphone-client-gnome/src/conference_obj.h

sflphone-client-gnome/src/contacts/Makefile.am

sflphone-client-gnome/src/contacts/calllist.c

sflphone-client-gnome/src/contacts/calllist.h

sflphone-client-gnome/src/contacts/calltab.c

sflphone-client-gnome/src/contacts/calltab.h

sflphone-client-gnome/src/contacts/calltree.c

sflphone-client-gnome/src/contacts/calltree.h

sflphone-client-gnome/src/contacts/conferencelist.c

sflphone-client-gnome/src/contacts/conferencelist.h

sflphone-client-gnome/src/dbus/callmanager-introspec.xml

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

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

sflphone-client-gnome/src/menus.c