Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 4 Apr 2011 09:31:33 +0000 (11:31 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 4 Apr 2011 09:31:33 +0000 (11:31 +0200)
commitda1c8637112d939badda4ae1440cd245be228b6b
treec5fb9fc9cd56cb11f73c69a386e233af6d1908d3
parentbae61bae48eed73797cc51dbc7f0059a66e11501
parentcec628a414b8c7ce0a904a579ecd79defbdcb2df
Merge branch 'master' into 0.11

Conflicts:
gst-libs/gst/tag/gstvorbistag.c
ext/ogg/gstoggmux.c
ext/pango/gsttextoverlay.c
gst-libs/gst/audio/gstbaseaudiosink.c
gst-libs/gst/audio/gstbaseaudiosrc.c
gst-libs/gst/rtp/gstrtcpbuffer.c
gst-libs/gst/tag/gstvorbistag.c
tests/check/libs/video.c