Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 17 May 2011 07:31:01 +0000 (09:31 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 17 May 2011 07:31:01 +0000 (09:31 +0200)
commitaf70f1fc3213bba6895f6af1468942f867e999a6
tree8a18142a8ba03d6f50e0267d4bd61d711cfc460d
parentdf5af9cdfdd82cacff30770940d091c94cbb6d13
parent30b2abaddd84a7f8bc61c8ebdc58b934c94712b4
Merge branch 'master' into 0.11
ext/cdparanoia/gstcdparanoiasrc.c