* Merged with ea434f5851f4.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Sun, 27 Apr 2008 21:38:18 +0000 (23:38 +0200)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Sun, 27 Apr 2008 21:38:18 +0000 (23:38 +0200)

Trivial merge