Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Fri, 20 Jul 2012 18:17:09 +0000 (19:17 +0100)
committerIan Lynagh <igloo@earth.li>
Fri, 20 Jul 2012 18:17:09 +0000 (19:17 +0100)

Trivial merge