Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 31 Mar 2011 15:53:12 +0000 (17:53 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 31 Mar 2011 15:53:12 +0000 (17:53 +0200)
1  2 
gst-libs/gst/audio/gstbaseaudiosink.c
tests/check/libs/libsabi.c

Simple merge
Simple merge