Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 22 May 2012 14:15:26 +0000 (15:15 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 22 May 2012 14:15:26 +0000 (15:15 +0100)
commit44febbcca3255cca222a1489e582d283d7bd9b04
treeeadf19ce604633b62cb8c35324dcf0a966220cde
parent1050b33632e14b119da56bfae401088dc3fd6abf
parent22b51daaf41820e5451cb8dadf63e2a534c3efb4
Merge branch 'master' of darcs.haskell.org/ghc