Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:25:11 +0000 (21:25 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 28 Nov 2011 21:25:11 +0000 (21:25 +0000)
commit0d87fd7146230b1384dc77b0fe73085587e70369
treea6b09f560a5a2a03e9c21eba20f7f7505f48da2b
parent6fe4d3196192eabbd4fc8fb8e931e5663da2cc9f
parent0a841f67126c59b21212d5105346945d318fd2bc
Merge remote-tracking branch 'origin/master' into 0.11

Conflicts:
gst-libs/gst/fft/gstffts16.h
gst-libs/gst/fft/gstfftf32.h
gst-libs/gst/fft/gstfftf64.h
gst-libs/gst/fft/gstffts16.h
gst-libs/gst/fft/gstffts32.h
gst/audioresample/gstaudioresample.c
gst/playback/gstplaysinkconvertbin.c
gst/typefind/gsttypefindfunctions.c