Merge branch 'master' into 0.11

diff --cc configure.ac
Simple merge

diff --cc gst/gst_private.h
Simple merge

diff --cc gst/gstconfig.h.in
Simple merge

diff --cc gst/gstpoll.c
Simple merge

diff --cc libs/gst/base/gstbasesink.c
Simple merge

diff --cc plugins/elements/gstfdsrc.c
Simple merge

diff --cc plugins/elements/gstinputselector.c
Simple merge