Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Thu, 14 Jun 2012 11:46:48 +0000 (12:46 +0100)
committerIan Lynagh <igloo@earth.li>
Thu, 14 Jun 2012 11:46:48 +0000 (12:46 +0100)

Trivial merge