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

Trivial merge