Merge branch 'master' into 0.11

Conflicts:
	ext/mad/gstmad.c

diff --cc configure.ac
Simple merge

diff --cc docs/plugins/Makefile.am
Simple merge

diff --cc ext/mad/gstmad.c
index 2fe4853,bdc4fc6..67cf79c
--- 1/ext/mad/gstmad.c
--- 2/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@@ -104,12 -103,7 +100,8 @@@ static GstStateChangeReturn gst_mad_cha
  static void gst_mad_set_index (GstElement * element, GstIndex * index);
  static GstIndex *gst_mad_get_index (GstElement * element);
  
- #ifdef HAVE_ID3TAG
- static GstTagList *gst_mad_id3_to_tag_list (const struct id3_tag *tag);
- #endif
- 
 -GST_BOILERPLATE (GstMad, gst_mad, GstElement, GST_TYPE_ELEMENT);
 +#define gst_mad_parent_class parent_class
 +G_DEFINE_TYPE (GstMad, gst_mad, GST_TYPE_ELEMENT);
  
  /*
  #define GST_TYPE_MAD_LAYER (gst_mad_layer_get_type())

diff --cc gst-plugins-ugly.spec.in
Simple merge

diff --cc gst/asfdemux/asfpacket.c
Simple merge