Merge remote-tracking branch 'origin/master'
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 19 Jun 2012 08:26:46 +0000 (09:26 +0100)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 19 Jun 2012 08:26:46 +0000 (09:26 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge