* Merged with 40cedf8842cb.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Fri, 12 Sep 2008 08:30:26 +0000 (10:30 +0200)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Fri, 12 Sep 2008 08:30:26 +0000 (10:30 +0200)

Trivial merge