Merge (tasuki lock modification backout)
authorStefan Ring <stefan@complang.tuwien.ac.at>
Wed, 6 Feb 2008 17:21:04 +0000 (18:21 +0100)
committerStefan Ring <stefan@complang.tuwien.ac.at>
Wed, 6 Feb 2008 17:21:04 +0000 (18:21 +0100)

Trivial merge