Merge region32 branch; fix conflicts
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>
Mon, 9 Jun 2008 05:57:26 +0000 (01:57 -0400)
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>
Mon, 9 Jun 2008 05:57:26 +0000 (01:57 -0400)

Trivial merge