Merge branch 'master' into 0.11

Conflicts:
	android/base.mk
	android/controller.mk
	android/dataprotocol.mk
	android/elements.mk
	android/gst-inspect.mk
	android/gst-launch.mk
	android/gst-plugin-scanner.mk
	android/gst.mk
	android/indexers.mk
	android/net.mk
	win32/common/libgstbase.def

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

diff --cc gst/Makefile.am
Simple merge

diff --cc gst/gst_private.h
Simple merge

diff --cc gst/gstbin.c
Simple merge

diff --cc gst/gstbus.c
index b729ce2,2cc41af..e670af5
--- 1/gst/gstbus.c
--- 2/gst/gstbus.c
+++ b/gst/gstbus.c
@@@ -106,7 -114,62 +114,34 @@@ struct _GstBusPrivat
  
  G_DEFINE_TYPE (GstBus, gst_bus, GST_TYPE_OBJECT);
  
 -/* fixme: do something about this */
 -static void
 -marshal_VOID__MINIOBJECT (GClosure * closure, GValue * return_value,
 -    guint n_param_values, const GValue * param_values, gpointer invocation_hint,
 -    gpointer marshal_data)
 -{
 -  typedef void (*marshalfunc_VOID__MINIOBJECT) (gpointer obj, gpointer arg1,
 -      gpointer data2);
 -  register marshalfunc_VOID__MINIOBJECT callback;
 -  register GCClosure *cc = (GCClosure *) closure;
 -  register gpointer data1, data2;
 -
 -  g_return_if_fail (n_param_values == 2);
 -
 -  if (G_CCLOSURE_SWAP_DATA (closure)) {
 -    data1 = closure->data;
 -    data2 = g_value_peek_pointer (param_values + 0);
 -  } else {
 -    data1 = g_value_peek_pointer (param_values + 0);
 -    data2 = closure->data;
 -  }
 -  callback =
 -      (marshalfunc_VOID__MINIOBJECT) (marshal_data ? marshal_data :
 -      cc->callback);
 -
 -  callback (data1, gst_value_get_mini_object (param_values + 1), data2);
 -}
 -
  static void
+ gst_bus_set_property (GObject * object,
+     guint prop_id, const GValue * value, GParamSpec * pspec)
+ {
+   GstBus *bus = GST_BUS_CAST (object);
+ 
+   switch (prop_id) {
+     case PROP_ENABLE_ASYNC:
+       bus->priv->enable_async = g_value_get_boolean (value);
+       break;
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       break;
+   }
+ }
+ 
+ static void
+ gst_bus_constructed (GObject * object)
+ {
+   GstBus *bus = GST_BUS_CAST (object);
+ 
+   if (bus->priv->enable_async) {
+     bus->priv->poll = gst_poll_new_timer ();
+     gst_poll_get_read_gpollfd (bus->priv->poll, &bus->priv->pollfd);
+   }
+ }
+ 
+ static void
  gst_bus_class_init (GstBusClass * klass)
  {
    GObjectClass *gobject_class = (GObjectClass *) klass;

diff --cc gst/gstelement.c
Simple merge

diff --cc libs/gst/base/Makefile.am
Simple merge

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

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

diff --cc libs/gst/controller/Makefile.am
Simple merge

diff --cc libs/gst/dataprotocol/Makefile.am
Simple merge

diff --cc libs/gst/net/Makefile.am
Simple merge

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

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

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

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

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

diff --cc tests/check/Makefile.am
Simple merge

diff --cc tests/check/gst/gstutils.c
Simple merge

diff --cc win32/common/libgstbase.def
index 6609f92,7f6a83c..61ab48e
--- 1/win32/common/libgstbase.def
--- 2/win32/common/libgstbase.def
+++ b/win32/common/libgstbase.def
@@@ -14,7 -14,18 +14,19 @@@ EXPORT
        gst_adapter_take
        gst_adapter_take_buffer
        gst_adapter_take_list
 +      gst_adapter_unmap
+       gst_base_parse_add_index_entry
+       gst_base_parse_convert_default
+       gst_base_parse_frame_init
+       gst_base_parse_get_type
+       gst_base_parse_push_frame
+       gst_base_parse_set_average_bitrate
+       gst_base_parse_set_duration
+       gst_base_parse_set_frame_rate
+       gst_base_parse_set_has_timing_info
+       gst_base_parse_set_min_frame_size
+       gst_base_parse_set_passthrough
+       gst_base_parse_set_syncable
        gst_base_sink_do_preroll
        gst_base_sink_get_blocksize
        gst_base_sink_get_last_buffer