Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Nov 2011 10:19:27 +0000 (10:19 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Nov 2011 10:19:27 +0000 (10:19 +0000)
commit150d292bf707de860a6ba85a174df321ed0b9d81
treeb2b96a6aff9b3d0151badb15ac0f55c387d2fc06
parent0f6ab7766e8cd131ed50c76f3a381ee690c3a010
parent521157f905926556eaa02a8fbb2f0645efe24a80
Merge branch 'master' of darcs.haskell.org/ghc