* Merged with 59ff46a9e236.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Tue, 9 Oct 2007 07:03:20 +0000 (09:03 +0200)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Tue, 9 Oct 2007 07:03:20 +0000 (09:03 +0200)

Trivial merge