* Merged with 0929f64b0434.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Fri, 5 Sep 2008 12:49:10 +0000 (14:49 +0200)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Fri, 5 Sep 2008 12:49:10 +0000 (14:49 +0200)

Trivial merge