Merge remote branch 'origin/nvc0'
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>
Tue, 4 Jan 2011 17:20:05 +0000 (18:20 +0100)
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>
Tue, 4 Jan 2011 17:20:05 +0000 (18:20 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge