Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Wed, 2 May 2012 17:01:32 +0000 (18:01 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 2 May 2012 17:01:32 +0000 (18:01 +0100)

Trivial merge