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

Trivial merge