Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Tue, 19 Jun 2012 18:36:26 +0000 (19:36 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 19 Jun 2012 18:36:26 +0000 (19:36 +0100)

Trivial merge