* Merged with 5a268f292149.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Sun, 16 Sep 2007 18:41:06 +0000 (20:41 +0200)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Sun, 16 Sep 2007 18:41:06 +0000 (20:41 +0200)

Trivial merge