Merge /Users/benl/devel/ghc/ghc-head-devel
authorBen Lippmeier <benl@ouroborus.net>
Tue, 22 Nov 2011 07:33:07 +0000 (18:33 +1100)
committerBen Lippmeier <benl@ouroborus.net>
Tue, 22 Nov 2011 07:33:07 +0000 (18:33 +1100)

Trivial merge