Merge branch 'master' into 0.11
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 12:14:51 +0000 (13:14 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Wed, 25 Jan 2012 12:14:51 +0000 (13:14 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge