Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Jul 2011 14:39:18 +0000 (15:39 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Jul 2011 14:39:18 +0000 (15:39 +0100)
commit1be86f92a270ff185f6355e055d92f7dad9e9e90
treef20a0e51afc7b4626a7e4cbd665c4f0572aa2522
parent5d89565b043eaff9028205b79363ef0d0c17ff17
parent48bc81ad466edfc80237015dbe5d78ba70eb5095
Merge branch 'master' of darcs.haskell.org/ghc