From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 4 Nov 2011 10:02:32 +0000 (+0100)
Subject: Merge branch 'master' into 0.11
X-Git-Tag: RELEASE-0.11.1~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e98c1e2a95b1b61e4624ca0a78811e388a57ae71;p=platform%2Fupstream%2Fgst-libav.git

Merge branch 'master' into 0.11

Conflicts:
	configure.ac
---

e98c1e2a95b1b61e4624ca0a78811e388a57ae71