Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 12 May 2011 07:48:07 +0000 (08:48 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 12 May 2011 07:48:07 +0000 (08:48 +0100)
commite4a77504c3c5c39eeec191006cb11000b18c2d15
tree642fe4b8a17165fad09281e463c989fed75fc600
parentcd54b707b0d77a3c62ee9f57b82dae98727f1c34
parente841f7a51531e99681a7c411adff0892c251f65f
Merge branch 'master' of darcs.haskell.org/ghc