* Merged with tip.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Wed, 25 Jun 2008 11:49:51 +0000 (13:49 +0200)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Wed, 25 Jun 2008 11:49:51 +0000 (13:49 +0200)

Trivial merge