Merged with 5c0d843cb949.
authorStefan Ring <stefan@complang.tuwien.ac.at>
Thu, 16 Oct 2008 06:42:42 +0000 (08:42 +0200)
committerStefan Ring <stefan@complang.tuwien.ac.at>
Thu, 16 Oct 2008 06:42:42 +0000 (08:42 +0200)

Trivial merge