Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 13 Jun 2012 16:26:56 +0000 (17:26 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 13 Jun 2012 16:26:56 +0000 (17:26 +0100)
commit1e9a2d34ae6996b6872ee4cc87bc8218360fcaf9
tree1c10162c5b8f6d83702cc3c80fb7418346318790
parent5a8ac0f823c151c062a3f1903574030423bb255c
parent2b015ce92253f6c64230b80603091c1fa426cf2e
Merge branch 'master' of darcs.haskell.org/ghc