Merge -> trunk.
authorStefan Ring <stefan@complang.tuwien.ac.at>
Mon, 3 Mar 2008 21:29:29 +0000 (22:29 +0100)
committerStefan Ring <stefan@complang.tuwien.ac.at>
Mon, 3 Mar 2008 21:29:29 +0000 (22:29 +0100)

Trivial merge