Merge branch 'master' into 0.11

author Sebastian Dröge <sebastian.droege@collabora.co.uk>

Mon, 30 May 2011 05:41:13 +0000 (07:41 +0200)

committer Sebastian Dröge <sebastian.droege@collabora.co.uk>

Mon, 30 May 2011 05:41:13 +0000 (07:41 +0200)
author Sebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 30 May 2011 05:41:13 +0000 (07:41 +0200)
committer Sebastian Dröge <sebastian.droege@collabora.co.uk>
Mon, 30 May 2011 05:41:13 +0000 (07:41 +0200)
diff --cc gst/gstelement.h
Simple merge
diff --cc gst/gstmessage.h
Simple merge
diff --cc gst/gststructure.c
Simple merge
diff --cc tests/check/gst/gstcaps.c
Simple merge
diff --cc tools/gst-launch.c
Simple merge
author	Sebastian Dröge <sebastian.droege@collabora.co.uk>
	Mon, 30 May 2011 05:41:13 +0000 (07:41 +0200)
committer	Sebastian Dröge <sebastian.droege@collabora.co.uk>
	Mon, 30 May 2011 05:41:13 +0000 (07:41 +0200)
		1	2
gst/gstelement.h	patch \|	diff1 \|	diff2 \|	blob \| history
gst/gstmessage.h	patch \|	diff1 \|	diff2 \|	blob \| history
gst/gststructure.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/check/gst/gstcaps.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/gst-launch.c	patch \|	diff1 \|	diff2 \|	blob \| history