Merge branch 'master' into 0.11

diff --cc gst/gstplugin.c
Simple merge

diff --cc libs/gst/base/Makefile.am
index 41d5e194fb1756246e3cd34492abd8c1369a2c5e,61c6675068ddb0d43fdd1cdef41f41b2f233f69b..4ba90e956e8d58e6662876c6eda083db05bc658b
--- 1/libs/gst/base/Makefile.am
--- 2/libs/gst/base/Makefile.am
+++ b/libs/gst/base/Makefile.am
@@@ -60,13 -60,14 +60,14 @@@ GstBase-@GST_MAJORMINOR@.gir: $(INTROSP
                --nsversion=@GST_MAJORMINOR@ \
                --strip-prefix=Gst \
                -I$(top_srcdir) \
+               -I$(top_srcdir)/libs \
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
 -              --library=libgstbase-0.10.la \
 -              --include=Gst-0.10 \
 +              --library=libgstbase-0.11.la \
 +              --include=Gst-0.11 \
                --libtool="$(top_builddir)/libtool" \
 -              --pkg gstreamer-0.10 \
 -              --pkg-export gstreamer-base-0.10 \
 +              --pkg gstreamer-0.11 \
 +              --pkg-export gstreamer-base-0.11 \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)

diff --cc libs/gst/check/Makefile.am
index b477c9b6cbcc062166dd1ae27fd761d725d69373,0dfbe4529dd225e5b3f91b2b535bf7c25961317c..0040ba5e373f1cb71471f5580c113337a426e611
--- 1/libs/gst/check/Makefile.am
--- 2/libs/gst/check/Makefile.am
+++ b/libs/gst/check/Makefile.am
@@@ -120,13 -120,14 +120,14 @@@ GstCheck-@GST_MAJORMINOR@.gir: $(INTROS
                --nsversion=@GST_MAJORMINOR@ \
                --strip-prefix=Gst \
                -I$(top_srcdir) \
+               -I$(top_srcdir)/libs \
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
 -              --library=libgstcheck-0.10.la \
 -              --include=Gst-0.10 \
 +              --library=libgstcheck-0.11.la \
 +              --include=Gst-0.11 \
                --libtool="$(top_builddir)/libtool" \
 -              --pkg gstreamer-0.10 \
 -              --pkg-export gstreamer-check-0.10 \
 +              --pkg gstreamer-0.11 \
 +              --pkg-export gstreamer-check-0.11 \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)

diff --cc libs/gst/net/Makefile.am
index b42cceaf3b2ee8c4c60f4f289fc8eb754da6d206,63a6e99640f5d94afcaf0b1b409388c3aba06aa4..87dfcef35457404daf8861902f0875aa24d1f413
--- 1/libs/gst/net/Makefile.am
--- 2/libs/gst/net/Makefile.am
+++ b/libs/gst/net/Makefile.am
@@@ -36,13 -36,14 +36,14 @@@ GstNet-@GST_MAJORMINOR@.gir: $(INTROSPE
                --strip-prefix=Gst \
                --nsversion=@GST_MAJORMINOR@ \
                -I$(top_srcdir) \
+               -I$(top_srcdir)/libs \
                $(gir_cincludes) \
                --add-include-path=$(top_builddir)/gst \
 -              --library=libgstnet-0.10.la \
 -              --include=Gst-0.10 \
 +              --library=libgstnet-@GST_MAJORMINOR@.la \
 +              --include=Gst-@GST_MAJORMINOR@ \
                --libtool="$(top_builddir)/libtool" \
 -              --pkg gstreamer-0.10 \
 -              --pkg-export="gstreamer-net-0.10" \
 +              --pkg gstreamer-@GST_MAJORMINOR@ \
 +              --pkg-export="gstreamer-net-@GST_MAJORMINOR@" \
                --output $@ \
                $(gir_headers) \
                $(gir_sources)