From be6d716e51eea255a95b842f1c5343c46cef4d9d Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Tue, 16 Aug 2011 13:10:54 +0200
Subject: [PATCH] Fix merge

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

diff --git a/mediastreamer2 b/mediastreamer2
index e29762297..008a3f7bd 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit e297622976e5dcae7ec9de1233178149d30b42ad
+Subproject commit 008a3f7bd43cec556875decbc437f80cec0d1af0