Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 13 Jun 2011 14:08:15 +0000 (15:08 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 13 Jun 2011 14:08:15 +0000 (15:08 +0100)
commitc1c2c25355bc462e521b2c5fb41ac79307da22ff
treec66226f924e4b0795972201563d6861405b5d5a6
parenteced7db98b3a8c7050196c619b5f7427a51417fd
parent3bb66cc52ced70cd7081fb8a2e32a1005528d5a0
Merge branch 'master' of darcs.haskell.org/ghc