Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 11:29:11 +0000 (12:29 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 11:29:11 +0000 (12:29 +0100)
commit130a8335a068ff769fcfdbe827a958feda18b141
treea1b4e68479d2bcb7aa7fdf1d915adc6b8008c01b
parent7e5aeba02f27ac495a8624514e7346a4e7ffe598
parent711e6a12efb6b506400f13b1ddc42603df6af3ee
Merge branch 'master' into 0.11

Conflicts:
gst/playback/gstdecodebin2.c
gst/playback/gstdecodebin2.c