* Merged with 291b838f1aed.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Tue, 4 Sep 2007 22:23:44 +0000 (00:23 +0200)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Tue, 4 Sep 2007 22:23:44 +0000 (00:23 +0200)

Trivial merge