Merge branch 'master' into 0.11

Conflicts:
	tests/examples/audio/Makefile.am
	tests/examples/v4l/Makefile.am

diff --cc ext/pango/Makefile.am
Simple merge

diff --cc gst-libs/gst/tag/gstvorbistag.c
Simple merge

diff --cc gst-libs/gst/tag/gstxmptag.c
Simple merge

diff --cc gst-libs/gst/tag/tag.h
Simple merge

diff --cc tests/examples/audio/Makefile.am
index d6a975d3f8130d22d0be02968b06870167d4cf3a,e0cc5ef0d0bf78e129e182fd15fb0f434581e2a0..49d72667203a616f81deff3ea1aac53a6480a9f5
--- 1/tests/examples/audio/Makefile.am
--- 2/tests/examples/audio/Makefile.am
+++ b/tests/examples/audio/Makefile.am
@@@ -2,6 -2,6 +2,5 @@@
  noinst_PROGRAMS = testchannels
  testchannels_SOURCES = testchannels.c
  testchannels_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
- testchannels_LDADD = $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
-       $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS)
- 
+ testchannels_LDADD = $(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_MAJORMINOR).la \
+                      $(GST_LIBS)
 -