Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 13 Nov 2011 13:32:30 +0000 (13:32 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 13 Nov 2011 13:36:29 +0000 (13:36 +0000)
commit4b0dce51489de11a9a9462d1c7e67964b9641ad6
tree4966e3f9af0e5a599d101e287be87a25a3f582b9
parent646de729d12651351b660b02842cd45d45df63da
parentcd21e699138ca17281a0a85c9e4ba6f1e76539a2
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
gst-libs/gst/audio/Makefile.am
gst-libs/gst/audio/audio.h
tests/examples/seek/jsseek.c
tests/examples/seek/seek.c
tests/icles/test-colorkey.c
configure.ac
gst-libs/gst/audio/audio.h
gst-libs/gst/audio/gstaudiodecoder.c
tests/examples/seek/jsseek.c
tests/examples/seek/seek.c
tests/icles/test-colorkey.c
tests/icles/test-videooverlay.c