Merge branch 'master' into codec_cleanup

hudson-sflphone-script.sh

sflphone-client-gnome/src/actions.c

sflphone-client-gnome/src/conference_obj.c

sflphone-client-gnome/src/conference_obj.h

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

sflphone-client-gnome/src/uimanager.c

sflphone-common/src/audio/codecs/audiocodecfactory.cpp

sflphone-common/src/history/historyitem.cpp

sflphone-common/src/plug-in/pluginmanager.cpp

sflphone-common/test/Makefile.am

sflphone-common/test/pluginmanagertest.cpp

sflphone-common/test/pluginmanagertest.h

sflphone-common/test/run_tests.sh