Merge branch 'master' into 0.11

diff --cc configure.ac
index d5e3afa,dd36366..f429d6b
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -40,9 -40,11 +40,11 @@@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_R
  dnl our libraries and install dirs use major.minor as a version
  GST_MAJORMINOR=$PACKAGE_VERSION_MAJOR.$PACKAGE_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