Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 16:22:02 +0000 (17:22 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 16:22:02 +0000 (17:22 +0100)
commit1091ebc9aaf430a0ed69f4ebd6190e31c3154e90
treecb7278b92f898972b3bb2708724222912d871ecb
parent3664c198bbf23acce9820104c06878aa78a32a39
parent97ce7b595418d629a57654b5af07133e6418b45e
Merge branch 'master' of darcs.haskell.org/ghc