From c7a2d74ea0799d6dc6b8a07e82523de351445f04 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 9 Aug 2010 10:28:46 +0200
Subject: [PATCH] merge

---
 mediastreamer2 | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 mediastreamer2

diff --git a/mediastreamer2 b/mediastreamer2
new file mode 160000
index 000000000..4b5164714
--- /dev/null
+++ b/mediastreamer2
@@ -0,0 +1 @@
+Subproject commit 4b5164714c2cf77a284f0213fc79e9b147e8563a