Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Mar 2011 15:21:13 +0000 (16:21 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Mar 2011 15:21:13 +0000 (16:21 +0100)
1  2 
configure.ac
gst-libs/gst/audio/gstbaseaudiosink.c
gst/playback/gstplaybin2.c

diff --cc configure.ac
Simple merge
Simple merge
Simple merge