Merge branch 'master' into 0.11

diff --cc configure.ac
index d1bd4a92824dfbd51504cb6470249b5f3840bc4f,374c7aaa83c734517993ed7432bd270a765a9fe3..fd1d11a67c990fe6719763ef44b3efc1dc832fbc
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -38,9 -38,11 +38,11 @@@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_R
  dnl our libraries and install dirs use major.minor as a version
  GST_MAJORMINOR=$GST_PLUGINS_BAD_VERSION_MAJOR.$GST_PLUGINS_BAD_VERSION_MINOR
  dnl we override it here if we need to for the release candidate of new series
 -GST_MAJORMINOR=0.10
 +GST_MAJORMINOR=0.11
  AC_SUBST(GST_MAJORMINOR)
  
+ AG_GST_LIBTOOL_PREPARE
+ 
  dnl FIXME: this macro doesn't actually work;
  dnl the generated libtool script has no support for the listed tags.
  dnl So this needs to be fixed first if we want to use this