Merge remote branch 'origin/nvc0'
authorChristoph Bumiller <e0425955@student.tuwien.ac.at>
Fri, 4 Mar 2011 10:02:10 +0000 (11:02 +0100)
committerChristoph Bumiller <e0425955@student.tuwien.ac.at>
Fri, 4 Mar 2011 10:02:10 +0000 (11:02 +0100)

Trivial merge