Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 31 Oct 2011 14:34:57 +0000 (14:34 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Mon, 31 Oct 2011 14:34:57 +0000 (14:34 +0000)
1  2 
gst/asfdemux/gstasfdemux.c

Simple merge