Merge branch 'master' into 0.11-fdo

diff --cc configure.ac
Simple merge

diff --cc gst-libs/gst/pbutils/gstdiscoverer.c
Simple merge

diff --cc gst/encoding/gstencodebin.c
Simple merge

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

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