Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 6 Jun 2011 14:27:12 +0000 (16:27 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 6 Jun 2011 14:27:12 +0000 (16:27 +0200)
commitc88ee10c9b6788b4518b144f26c5b01fe4d94542
treefb62fe9d2f55e08ae4ca6a9b4003b9dd1cbf8aba
parent8722bdc694d70cb92fb69a969cf95a568439a234
parent5ed90ffc2c694a9e0569d34d8a46e7006bee3e05
Merge branch 'master' into 0.11

Conflicts:
ext/theora/gsttheoraenc.c
ext/ogg/gstoggmux.c
ext/theora/gsttheoraenc.c
gst-libs/gst/pbutils/gstdiscoverer.c
gst-libs/gst/tag/gsttagdemux.c
gst/adder/gstadder.c