Conflicts:
	linphone/mediastreamer2/build/wince/alldescs.h
	linphone/mediastreamer2/build/wince/mediastreamer2.vcproj
	linphone/oRTP/build/wince/oRTP.vcproj