Merge remote-tracking branch 'origin/0.10'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:00:22 +0000 (15:00 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Thu, 29 Mar 2012 13:00:22 +0000 (15:00 +0200)
commit9e13d70b2ca4680d419d9426537f099cdcef8d03
tree45e1de3e6bcdd9f72d68789da8cfd9fb96cbf48f
parent435c340d158c872cc18db9ad1f23f049c6f82c2c
parentb47350b6e97db908448921e9700e5ff7a8764f41
Merge remote-tracking branch 'origin/0.10'

Conflicts:
gst-libs/gst/video/video-overlay-composition.c
tests/check/libs/video.c
gst-libs/gst/pbutils/descriptions.c
gst-libs/gst/riff/riff-read.c
gst-libs/gst/video/video-overlay-composition.c
gst/playback/gstplaysink.c
tests/check/libs/video.c
tests/examples/playback/playback-test.c