Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Sep 2011 17:07:23 +0000 (19:07 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Sep 2011 17:07:23 +0000 (19:07 +0200)
commit854f4d846b50afa3fe834dd1b9b8057a1b1a23c7
treec6ff4694397030e346b49c264be2db093d0bee08
parent5737f8cc82a125d98e6644b33c5c17cacf4c85a2
parent62497d4ba8f8e2759f0772e3eab77e1445701dcd
Merge branch 'master' into 0.11

Conflicts:
ext/mad/gstmad.c
configure.ac
docs/plugins/Makefile.am
ext/mad/gstmad.c
gst-plugins-ugly.spec.in
gst/asfdemux/asfpacket.c