Conflicts:
	linphone/coreapi/exevents.c
	linphone/coreapi/friend.c
	linphone/coreapi/linphonecore.c
	linphone/coreapi/lpconfig.c
	linphone/mediastreamer2/build/wince/mediastreamer2.def
	linphone/mediastreamer2/build/wince/mediastreamer2.vcproj
	linphone/mediastreamer2/src/msvolume.c
	linphone/oRTP/build/wince/oRTP.vcproj
	linphone/oRTP/src/rtpsession.c

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@801 3f6dc0c8-ddfe-455d-9043-3cd528dc4637