Merged with new-trap-decoding branch at rev a792088a3f04 (branch closed).
authorMichael Starzinger <michi@complang.tuwien.ac.at>
Wed, 15 Apr 2009 15:04:15 +0000 (17:04 +0200)
committerMichael Starzinger <michi@complang.tuwien.ac.at>
Wed, 15 Apr 2009 15:04:15 +0000 (17:04 +0200)

Trivial merge