* Merged with 7d4cc49cbd31.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Sun, 8 Jun 2008 20:26:01 +0000 (22:26 +0200)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Sun, 8 Jun 2008 20:26:01 +0000 (22:26 +0200)

Trivial merge