Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 20 Mar 2012 09:37:41 +0000 (09:37 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 20 Mar 2012 09:37:41 +0000 (09:37 +0000)
commit69570789166052c90a335dadbfaa8cfc1ad84330
treeb529643b3c5059c28f1cd9f8e0300b40df134de7
parent15ebeeabb93fd37324b844563b32d41d49658fe9
parentd7bd9ee63968f6e4df6b32eff8ff11d866dca794
Merge branch 'master' of darcs.haskell.org/ghc