Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 16 May 2011 15:52:11 +0000 (17:52 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 16 May 2011 15:52:11 +0000 (17:52 +0200)
Conflicts:
configure.ac

1  2 
configure.ac
ext/flac/gstflacdec.c
gst/isomp4/qtdemux.c
gst/matroska/matroska-demux.c

diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge