Merge branch 'alex'
authorWouter Verhelst <w@uter.be>
Sat, 28 May 2011 08:47:21 +0000 (10:47 +0200)
committerWouter Verhelst <w@uter.be>
Sat, 28 May 2011 08:47:21 +0000 (10:47 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge