Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 9 Oct 2011 15:08:36 +0000 (16:08 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 9 Oct 2011 15:08:36 +0000 (16:08 +0100)
commit303dbaf84bde3070e1e0d3a5ffe2f58013854982
treebe77b3a4a3a73648dc16c7ff3e2a4af16b5f9c2b
parent889a7e89c9029305b77d4270af8a425024e6e43d
parentbc6f00becb630204f83593ef0320d19aacec5df7
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
tests/check/pipelines/vorbisdec.c
tests/check/pipelines/vorbisenc.c
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudioencoder.c
tests/check/elements/vorbisdec.c
tests/check/pipelines/vorbisdec.c
tests/check/pipelines/vorbisenc.c