Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Sat, 16 Jun 2012 19:02:50 +0000 (20:02 +0100)
committerIan Lynagh <igloo@earth.li>
Sat, 16 Jun 2012 19:02:50 +0000 (20:02 +0100)

Trivial merge