Merge remote branch 'origin/master' into nvc0-new
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>
Sun, 19 Dec 2010 20:46:33 +0000 (21:46 +0100)
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>
Sun, 19 Dec 2010 20:46:33 +0000 (21:46 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge