Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Feb 2012 09:01:30 +0000 (10:01 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 21 Feb 2012 09:01:30 +0000 (10:01 +0100)
commitd2ea46cdbf57390d0b79efbcc2593047e7489d90
treea5e6a2543c7f0bd2a52e067f0229c3394a2e6b3e
parent26f63027a66ebe01c77d25bae7d490d0740b4968
parent0c85bb60ea8b322c5dc2ed7517f98e7d8c61bef5
Merge branch 'master' into 0.11

Conflicts:
tests/examples/seek/seek.c
gst-libs/gst/riff/riff-media.c
tests/examples/seek/Makefile.am
tests/examples/seek/seek.c