Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 25 Jul 2011 08:17:42 +0000 (09:17 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 25 Jul 2011 08:17:42 +0000 (09:17 +0100)
commit7e2e23b84f21388aa12f202567abbcc1cbf6de69
treeb5acdf9a4161f9c0822ba9c755010c79bb35e685
parent525aca2c11c510ce83a593b6cedfacc54a2b7806
parent73523d2f7e24937e8aa494200bcb65c1101bba99
Merge branch 'master' of darcs.haskell.org/ghc