[0.11] gst-plugins-base: Merge branch 'master' into 0.11

[Wim Taymans]

Module: gst-plugins-base
Branch: 0.11
Commit: 19346c2c3b9da3dd329b703b2371f0e7de7d01da
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=19346c2c3b9da3dd329b703b2371f0e7de7d01da

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Wed Sep 28 11:35:46 2011 +0200

Merge branch 'master' into 0.11

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

---