Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Thu, 7 Jun 2012 16:29:57 +0000 (17:29 +0100)
committerIan Lynagh <igloo@earth.li>
Thu, 7 Jun 2012 16:29:57 +0000 (17:29 +0100)

Trivial merge