* Merged with 03e39cff22db.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Tue, 22 Jan 2008 12:54:11 +0000 (13:54 +0100)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Tue, 22 Jan 2008 12:54:11 +0000 (13:54 +0100)

Trivial merge