Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 13 Dec 2011 11:33:27 +0000 (11:33 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 13 Dec 2011 11:33:27 +0000 (11:33 +0000)
commit83030e70225fcf5bbeb6683194fd7b66c47fe3dc
tree06614166f5b9382f5fd83aafe7e911522e799bfc
parent56a05294f3a94a6826c8eaaef6c9946d42c71eaf
parentd95a7f1311578cf37c0889098d32cbcb8964d906
Merge branch 'master' of darcs.haskell.org//ghc