Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 2 Jun 2011 16:46:11 +0000 (18:46 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 2 Jun 2011 16:46:11 +0000 (18:46 +0200)
Conflicts:
configure.ac

1  2 
configure.ac
ext/mad/gstmad.c

diff --cc configure.ac
Simple merge
Simple merge