Merged 7484:52fc709fd248.
authorPeter Molnar <pm@complang.tuwien.ac.at>
Wed, 12 Sep 2007 12:44:01 +0000 (12:44 +0000)
committerPeter Molnar <pm@complang.tuwien.ac.at>
Wed, 12 Sep 2007 12:44:01 +0000 (12:44 +0000)

Trivial merge