* Merge with d3ee7ee07ed2.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Tue, 15 Jul 2008 14:01:23 +0000 (16:01 +0200)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Tue, 15 Jul 2008 14:01:23 +0000 (16:01 +0200)

Trivial merge