Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 5 Aug 2011 10:15:50 +0000 (11:15 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 5 Aug 2011 10:15:50 +0000 (11:15 +0100)
commit7c39ab0209fa6cc8447c9ab28563d0046dae0b7a
tree848b839988b48381251952e2b4bdbab423f5255a
parent1ae5e77cbdd51912ef96ff6e3d554f27354ff982
parent59534b8022acf97e9f475cde14b85cd0d74088ac
Merge branch 'master' of darcs.haskell.org/ghc