Merge branch 'master' into release

Conflicts:
	sflphone-client-gnome/src/Makefile.am
	sflphone-client-gnome/src/dbus/dbus.c
	sflphone-client-gnome/src/dbus/dbus.h
	sflphone-client-gnome/src/errors.c
	sflphone-client-gnome/src/errors.h
	sflphone-client-gnome/src/main.c
	sflphone-common/libs/pjproject/pjlib-util/include/pjlib-util/config.h
	sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/resolver_wrap.cpp
	sflphone-common/libs/pjproject/pjlib-util/src/pjlib-util/xml_wrap.cpp
	sflphone-common/libs/pjproject/pjlib/include/pj/config.h
	sflphone-common/libs/pjproject/pjlib/src/pj/addr_resolv_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/exception_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/ioqueue_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/ip_helper_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/log_writer_symbian_console.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/os_core_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/os_error_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/pool_policy_new.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/sock_qos_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/sock_select_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/sock_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/ssl_sock_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/timer_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pj/unicode_symbian.cpp
	sflphone-common/libs/pjproject/pjlib/src/pjlib++-test/main.cpp
	sflphone-common/libs/pjproject/pjlib/src/pjlib-test/exception_wrap.cpp
	sflphone-common/libs/pjproject/pjlib/src/pjlib-test/pool_wrap.cpp
	sflphone-common/libs/pjproject/pjlib/src/pjlib-test/test_wrap.cpp
	sflphone-common/libs/pjproject/pjmedia/include/pjmedia-audiodev/config.h
	sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config.h
	sflphone-common/libs/pjproject/pjmedia/include/pjmedia/config.h
	sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp
	sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp
	sflphone-common/libs/pjproject/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp
	sflphone-common/libs/pjproject/pjmedia/src/pjmedia/sdp_wrap.cpp
	sflphone-common/libs/pjproject/pjnath/include/pjnath/config.h
	sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_auth_parser_wrap.cpp
	sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_dialog_wrap.cpp
	sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_endpoint_wrap.cpp
	sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_parser_wrap.cpp
	sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_tel_uri_wrap.cpp
	sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_transport_wrap.cpp
	sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_proxy_wrap.cpp
	sflphone-common/libs/pjproject/pjsip/src/pjsip/sip_util_wrap.cpp
	sflphone-common/src/audio/codecs/audiocodec.h
	sflphone-common/src/audio/common.h
	sflphone-common/src/manager.h
	sflphone-common/src/plug-in/audiorecorder/audiodsp.cpp
	sflphone-common/src/plug-in/audiorecorder/audiodsp.h
	sflphone-common/src/plug-in/audiorecorder/audiorecord.h