Merge branch 'master' of /Users/benl/devel/ghc/ghc-head
authorBen Lippmeier <benl@ouroborus.net>
Fri, 15 Apr 2011 05:24:42 +0000 (15:24 +1000)
committerBen Lippmeier <benl@ouroborus.net>
Fri, 15 Apr 2011 05:24:42 +0000 (15:24 +1000)

Trivial merge