Merged with 8445:be1a0bcbb96d.
authorPeter Molnar <pm@complang.tuwien.ac.at>
Fri, 11 Jul 2008 09:04:48 +0000 (11:04 +0200)
committerPeter Molnar <pm@complang.tuwien.ac.at>
Fri, 11 Jul 2008 09:04:48 +0000 (11:04 +0200)

Trivial merge