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)
commit13c252b2a8ffbe31ffb310ec82cb08609e5a781a
tree9bc8d2538306367b4073bae6a0a1d0dae764cf2a
parent62758d8ff159a3389d3b52c751598bb3daeb7d7d
parenta184490e6c42736aee0316719f7b4e9d4dc1f997
Merge branch 'master' into 0.11

Conflicts:
configure.ac
configure.ac
ext/mad/gstmad.c