Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Aug 2011 06:47:23 +0000 (07:47 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 3 Aug 2011 06:47:23 +0000 (07:47 +0100)
commit37549fa8a1fd2b4b9c72564cd7c1db4cfe7bcb32
tree82fd2e5f1b1ceea80cf5860d5a3164e7cca51055
parent3bf0520aea5acbecb83dcc0fc722c79ce9f5723c
parent1422ea4e0d9e0e9995e57da7ce00fec8109e6772
Merge branch 'master' of darcs.haskell.org/ghc