Merged with tip.
authorStefan Ring <stefan@complang.tuwien.ac.at>
Wed, 17 Sep 2008 14:39:32 +0000 (16:39 +0200)
committerStefan Ring <stefan@complang.tuwien.ac.at>
Wed, 17 Sep 2008 14:39:32 +0000 (16:39 +0200)

Trivial merge