[0.11] gst-plugins-base: Merge branch 'master' into 0.11

Thu Sep 8 05:42:32 PDT 2011

Module: gst-plugins-base
Branch: 0.11
Commit: 0f654f3febf02df2897b435e8bf2d9cfe87f449b
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=0f654f3febf02df2897b435e8bf2d9cfe87f449b

Author: Sebastian DrÃ¶ge <sebastian.droege at collabora.co.uk>
Date:   Thu Sep  8 14:42:00 2011 +0200

Merge branch 'master' into 0.11

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

---