Merge branch 'master' into 0.11

diff --cc gst/gstelementfactory.c
index fc458eb,3549432..097c2cb
--- 1/gst/gstelementfactory.c
--- 2/gst/gstelementfactory.c
+++ b/gst/gstelementfactory.c
@@@ -394,11 -394,11 +394,11 @@@ gst_element_factory_create (GstElementF
     * an element at the same moment
     */
    oclass = GST_ELEMENT_GET_CLASS (element);
-   if (!g_atomic_pointer_compare_and_exchange (
-           (gpointer) & oclass->elementfactory, NULL, factory))
+   if (!G_ATOMIC_POINTER_COMPARE_AND_EXCHANGE (&oclass->elementfactory, NULL,
+           factory))
      gst_object_unref (factory);
  
 -  GST_DEBUG ("created element \"%s\"", GST_PLUGIN_FEATURE_NAME (factory));
 +  GST_DEBUG ("created element \"%s\"", GST_OBJECT_NAME (factory));
  
    return element;
  

diff --cc gst/gstsystemclock.c
Simple merge

diff --cc gst/gstutils.c
Simple merge

diff --cc gst/parse/Makefile.am
Simple merge

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