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)
commitcf1248e566ca460f4c24daef39d2ff488974c246
treeccbacaa5ec43572e5981e68b0b1d4d5d01167621
parenta0e301ab1a80f6e6f1919baa318ba792fa24d878
parent8b910885ecec02c1974a2689ee06e3bd3f0b8cca
Merge branch 'master' into 0.11

Conflicts:
configure.ac
configure.ac
ext/flac/gstflacdec.c
gst/isomp4/qtdemux.c
gst/matroska/matroska-demux.c