Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 31 Oct 2012 16:15:46 +0000 (16:15 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 31 Oct 2012 16:15:46 +0000 (16:15 +0000)
commit33d0f4992bb2340e4a7abb2c5eb92c2672d844dd
treef65fc89aa3d3601c2925ee1b4c862444bbb9c099
parent2677e4287c3eaee4249e4b6fe31586f2f698c33d
parent984149bf8845dd897e038943b6177ae4fb184591
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc