gstreamer: Merge remote-tracking branch 'origin/0.10'

[Mark Nauwelaerts]

Module: gstreamer
Branch: master
Commit: 304047b13d72ea87efd03ec768b75fa09d374fac
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=304047b13d72ea87efd03ec768b75fa09d374fac

Author: Mark Nauwelaerts <mark.nauwelaerts at collabora.co.uk>
Date:   Tue Apr 17 12:29:50 2012 +0200

Merge remote-tracking branch 'origin/0.10'

Conflicts:
	libs/gst/base/gstcollectpads2.c

---