Merge branch 'master' into 0.11

Conflicts:
	configure.ac

diff --cc gst/gstquery.c
Simple merge

diff --cc gst/gstquery.h
Simple merge

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

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

diff --cc tools/gst-launch.c
Simple merge