Merge branch 'master' into 0.11

Conflicts:
	docs/gst/gstreamer-sections.txt
	gst/gstelementfactory.c
	gst/gstminiobject.c

diff --cc docs/gst/gstreamer-sections.txt
Simple merge

diff --cc docs/libs/gstreamer-libs-sections.txt
Simple merge

diff --cc gst/gstbufferlist.c
index 0af57d313e4b5e60add485f5730fe8836cba5562,721c4c3ca1eed08bbed4fbf09ca8da608e946cba..42690f98225a48ffc9bea3b8d1804bf488733ae6
--- 1/gst/gstbufferlist.c
--- 2/gst/gstbufferlist.c
+++ b/gst/gstbufferlist.c
@@@ -38,9 -127,11 +38,8 @@@
  
  #define GST_CAT_DEFAULT GST_CAT_BUFFER_LIST
  
 -#define GROUP_START NULL
 -static gconstpointer STOLEN = "";
 -
  /**
   * GstBufferList:
-  * @mini_object: the parent structure
   *
   * Opaque list of grouped buffers.
   *

diff --cc gst/gstcaps.h
Simple merge

diff --cc gst/gstelement.c
Simple merge

diff --cc gst/gstelement.h
Simple merge

diff --cc gst/gstsystemclock.h
Simple merge

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

diff --cc libs/gst/dataprotocol/dataprotocol.h
Simple merge

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

diff --cc tests/check/gst/gstminiobject.c
index 9330a4d07cde007c902d54e88a70e4381f9ba6a3,9b9c1cde9cda1ebcadd4bcb4313c4ba240a66882..b4ffcb8cbbd767d68c896a3f3850a9639f5e695d
--- 1/tests/check/gst/gstminiobject.c
--- 2/tests/check/gst/gstminiobject.c
+++ b/tests/check/gst/gstminiobject.c
@@@ -402,6 -447,23 +402,23 @@@ GST_START_TEST (test_value_collection
  GST_END_TEST;
  
  
 -  gst_value_set_mini_object (&value, NULL);
+ GST_START_TEST (test_dup_null_mini_object)
+ {
+   GValue value = { 0, };
+   GstMiniObject *mo;
+ 
+   g_value_init (&value, GST_TYPE_BUFFER);
+ 
 -  mo = gst_value_dup_mini_object (&value);
++  g_value_set_boxed (&value, NULL);
+ 
++  mo = GST_MINI_OBJECT_CAST (g_value_dup_boxed (&value));
+   g_assert (mo == NULL);
+ 
+   g_value_unset (&value);
+ }
+ 
+ GST_END_TEST;
+ 
  static Suite *
  gst_mini_object_suite (void)
  {
@@@ -417,8 -479,9 +434,9 @@@
    tcase_add_test (tc_chain, test_make_writable);
    tcase_add_test (tc_chain, test_ref_threaded);
    tcase_add_test (tc_chain, test_unref_threaded);
 -  tcase_add_test (tc_chain, test_recycle_threaded);
 +  //tcase_add_test (tc_chain, test_recycle_threaded);
    tcase_add_test (tc_chain, test_value_collection);
+   tcase_add_test (tc_chain, test_dup_null_mini_object);
    return s;
  }