Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 12 Jan 2012 15:11:06 +0000 (15:11 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 12 Jan 2012 15:11:06 +0000 (15:11 +0000)
commita686d1cb6dbaa28b629f6e7aa9a5a6b44d1f3ab1
tree150eba98aa57b5838967fd06838bf5d303010b4d
parent5508ada4b1d90ee54d92f69bbff7f66b3e8eceef
parent71e5ee7d1656444ad23d0610ddaf9fc99a58b190
Merge branch 'master' of darcs.haskell.org/ghc