From 26913d3cd5d6cb0fc0fcc204aba46c6bb2254429 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 30 Jun 2010 11:07:07 +0200
Subject: [PATCH] update ms2

Conflicts:

	mediastreamer2
---
 mediastreamer2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediastreamer2 b/mediastreamer2
index 83533eea4..fe1b42af3 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 83533eea4df856c55b54dfa8afcb96dde93c05f9
+Subproject commit fe1b42af3dc102d873fb77ecd72dfc96c3771d2a