Merge branch 'master' into 0.11

Conflicts:
	docs/libs/Makefile.am
	tests/check/elements/decodebin2.c

diff --cc docs/libs/Makefile.am
index 4014d8b,81955a1..83e8039
--- 1/docs/libs/Makefile.am
--- 2/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@@ -98,8 -55,20 +55,20 @@@ extra_files 
  
  # CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib
  # contains GtkObjects/GObjects and you want to document signals and properties.
 -GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
 +GTKDOC_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) -DGST_USE_UNSTABLE_API
- GTKDOC_LIBS = $(SCANOBJ_DEPS) $(GST_BASE_LIBS)
+ GTKDOC_LIBS = \
+       $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/fft/libgstfft-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/rtsp/libgstrtsp-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/sdp/libgstsdp-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \
+       $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \
+   $(GST_BASE_LIBS)
  
  GTKDOC_CC=$(LIBTOOL) --tag=CC --mode=compile $(CC)
  GTKDOC_LD=$(LIBTOOL) --tag=CC --mode=link $(CC)

diff --cc docs/plugins/Makefile.am
index f304621,ff418ec..60111f3
--- 1/docs/plugins/Makefile.am
--- 2/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@@ -54,17 -34,11 +34,11 @@@ FIXXREF_OPTIONS=--extra-dir=$(top_build
        --extra-dir=$(datadir)/gtk-doc/html
  
  # Used for dependencies.
- HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.h
- CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.c
- 
- # this is a wingo addition
- # thomasvs: another nice wingo addition would be an explanation on why
- # this is useful ;)
- 
- SCANOBJ_DEPS =
+ HFILE_GLOB=$(top_srcdir)/gst/*/*.h $(top_srcdir)/ext/*/*.h $(top_srcdir)/sys/*/*.h
+ CFILE_GLOB=$(top_srcdir)/gst/*/*.c $(top_srcdir)/ext/*/*.c $(top_srcdir)/sys/*/*.c
  
  # Header files to ignore when scanning.
 -IGNORE_HFILES = avcodec.h gstffmpegcodecmap.h dsputil.h arch.h speex_resampler.h speex_resampler_wrapper.h fixed_arm4.h fixed_arm5e.h fixed_bfin.h fixed_debug.h fixed_generic.h resample_sse.h
 +IGNORE_HFILES = avcodec.h dsputil.h arch.h speex_resampler.h speex_resampler_wrapper.h fixed_arm4.h fixed_arm5e.h fixed_bfin.h fixed_debug.h fixed_generic.h resample_sse.h
  IGNORE_CFILES = utils.c mem.c imgconvert.c
  
  # we add all .h files of elements that have signals/args we want

diff --cc ext/theora/gsttheoraenc.c
Simple merge

diff --cc gst-plugins-base.spec.in
index 9a9d421,fca3482..9a0f9d7
--- 1/gst-plugins-base.spec.in
--- 2/gst-plugins-base.spec.in
+++ b/gst-plugins-base.spec.in
@@@ -280,16 -286,9 +283,17 @@@ GStreamer Plugins Base library developm
  # gtk-doc documentation
  %doc %{_datadir}/gtk-doc/html/gst-plugins-base-libs-%{majorminor}
  %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor}
+ %doc %{_datadir}/gst-plugins-base/license-translations.dict
  
  %changelog
 +* Sun Aug 07 2011 Thomas Vander Stichele <thomas at apestaart dot org>
 +- rename to gstreamer011
 +- require 0.11 gstreamer
 +- properly use majorminor macro
 +- libgstplayback.so now contains playbin/decodebin elements.
 +- gstappbuffer is gone
 +- added metavideo and videopool headers
 +
  * Fri Dec 15 2006 Thomas Vander Stichele <thomas at apestaart dot org>
  - add doap file
  - cleanups

diff --cc gst/audiotestsrc/gstaudiotestsrc.h
Simple merge

diff --cc gst/playback/gstdecodebin2.c
Simple merge

diff --cc gst/playback/gstplaysink.c
Simple merge

diff --cc tests/check/elements/audiorate.c
Simple merge