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

Wed Apr 4 03:26:05 PDT 2012

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

Author: Sebastian DrÃ¶ge <sebastian.droege at collabora.co.uk>
Date:   Wed Apr  4 12:25:40 2012 +0200

Merge remote-tracking branch 'origin/0.10'

Conflicts:
	docs/gst/gstreamer-sections.txt
	gst/Makefile.am
	gst/gst.c
	gst/gst.h
	gst/gstevent.c
	gst/gstevent.h
	gst/gstmessage.c
	gst/gstmessage.h
	gst/gstquark.c
	gst/gstquark.h
	gst/gstquery.c
	gst/gstquery.h
	gst/gsttoc.c
	gst/gsttoc.h
	gst/gsttocsetter.c
	tests/check/Makefile.am
	tests/check/gst/gsttoc.c
	tests/check/gst/gsttocsetter.c

---