Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 29 Jul 2011 10:21:50 +0000 (11:21 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 29 Jul 2011 10:21:50 +0000 (11:21 +0100)
commit969383ba17493d67664b2c0faaec481561401b18
tree56104aaf87081f29ac95b243d9f9f3082be73acf
parent1538916de5c806faf0599cbaab2e2c7710127143
parent06dc1813f5cfc42010925ad7d36dff1791d846ae
Merge branch 'master' of darcs.haskell.org/ghc