Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 22 Mar 2012 21:01:39 +0000 (21:01 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 22 Mar 2012 21:01:39 +0000 (21:01 +0000)

Trivial merge