* Merged with 03e39cff22db.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Wed, 23 Jan 2008 09:40:40 +0000 (10:40 +0100)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Wed, 23 Jan 2008 09:40:40 +0000 (10:40 +0100)

Trivial merge