Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 14 Feb 2012 09:51:38 +0000 (10:51 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 14 Feb 2012 09:51:38 +0000 (10:51 +0100)
commit63ec4ca38bcd272151feeac05a4a4410b8488767
treec54d1dcfb28200d94881e18e2a5e200903d3a68b
parent1ae32656ae80ce31dffe3f33a0bdabb06571c0e1
parentec6b2e8659dd901ca9156bd524137cc285d531a0
Merge branch 'master' into 0.11

Conflicts:
tests/check/elements/flacparse.c
tests/check/elements/flacparse.c