Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 6 Nov 2012 16:26:57 +0000 (16:26 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 6 Nov 2012 16:26:57 +0000 (16:26 +0000)
commit2e43779c758294571bdf5ef6f2be440487d8e196
tree9fc4cb1239a15fba6292952c86664b507bec2222
parent545bb79667ebcbf5e776f76518cf68b4d507e7f5
parent9f68cceca364600e2ed8d8b4c9e2684eb83549fc
Merge branch 'master' of darcs.haskell.org/ghc