Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 09:35:46 +0000 (11:35 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 28 Sep 2011 09:35:46 +0000 (11:35 +0200)
commit19346c2c3b9da3dd329b703b2371f0e7de7d01da
tree84ab39a87d9238b972728ea815c0a833a9f587a6
parent4bf9022e0c2d22f515e87d10541a5e9534695859
parentceea972b42dadada2b105131f79866050faf7110
Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/audio/gstaudioencoder.c
gst/playback/gstplaybin2.c
gst/videotestsrc/videotestsrc.c
gst-libs/gst/audio/gstaudioencoder.c
gst/playback/gstplaybin2.c