Merge branch 'master' into 0.11

Conflicts:
	common
	configure.ac

diff --cc common
index 710d453,e4a9407..0546e58
--- 1/common
--- 2/common
+++ b/common
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 710d453582f386bd76a3355617ac019561cb2039
 -Subproject commit e4a9407a51803016bab9918b03e2034981886bdb
++Subproject commit 0546e5881d1ec7137c71d35247729e28c1a4ab66

diff --cc configure.ac
index 1be2af9,06423a4..83fd6ef
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -656,10 -681,13 +656,12 @@@ AC_SUBST(GST_OPTION_CXXFLAGS
  dnl GST_ALL_*
  dnl vars common to for all internal objects (core libs, elements, applications)
  dnl CFLAGS:
 -dnl - XML needs to be added because xmlPtr is used in core
  dnl - src and build dirs need to be added because every piece that gets built
  dnl   will need the GStreamer source and generated headers
- GST_ALL_CXXFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CXXFLAGS) \$(ERROR_CXXFLAGS)"
- GST_ALL_CFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS $GLIB_EXTRA_CFLAGS \$(GST_OPTION_CFLAGS) \$(ERROR_CFLAGS)"
+ dnl LIBS: XML doesn't need to be added because we don't explicitly use symbols
+ dnl       from LibXML except for in the core library
+ GST_ALL_CXXFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS $(GLIB_EXTRA_CFLAGS) $XML_CFLAGS \$(GST_OPTION_CXXFLAGS) \$(ERROR_CXXFLAGS)"
+ GST_ALL_CFLAGS="-I\$(top_srcdir)/libs -I\$(top_srcdir) -I\$(top_builddir)/libs -I\$(top_builddir) $GLIB_CFLAGS \$(GLIB_EXTRA_CFLAGS) $XML_CFLAGS \$(GST_OPTION_CFLAGS) \$(ERROR_CFLAGS)"
  
  dnl FIXME: check if LTLIBINTL is needed everywhere
  dnl I presume it is given that it contains the symbols that _() stuff maps to

diff --cc libs/gst/base/gstadapter.c
index b340ecc,0f8053d..7d54acf
--- 1/libs/gst/base/gstadapter.c
--- 2/libs/gst/base/gstadapter.c
+++ b/libs/gst/base/gstadapter.c
@@@ -779,11 -735,11 +779,11 @@@ done
   * Since: 0.10.31
   */
  GList *
 -gst_adapter_take_list (GstAdapter * adapter, guint nbytes)
 +gst_adapter_take_list (GstAdapter * adapter, gsize nbytes)
  {
-   GList *result = NULL, *tail = NULL;
+   GQueue queue = G_QUEUE_INIT;
    GstBuffer *cur;
 -  guint hsize, skip;
 +  gsize hsize, skip;
  
    g_return_val_if_fail (GST_IS_ADAPTER (adapter), NULL);
    g_return_val_if_fail (nbytes <= adapter->size, NULL);