* Merged with 2f7527b6fb58.
authorChristian Thalinger <twisti@complang.tuwien.ac.at>
Wed, 17 Sep 2008 15:01:21 +0000 (17:01 +0200)
committerChristian Thalinger <twisti@complang.tuwien.ac.at>
Wed, 17 Sep 2008 15:01:21 +0000 (17:01 +0200)

Trivial merge