Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 22 Mar 2012 21:01:39 +0000 (21:01 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 22 Mar 2012 21:01:39 +0000 (21:01 +0000)
commitca7c3a0e1aba18379548b76775181bf464214ae3
tree23470ff249b2c5fbb9e36d332ab28a0b6d8967bd
parent27e3bd8cb9413002b6534fcc585f9b658372fe4e
parentee8bf699516dd8e603e26a7c862538e83da2c250
Merge branch 'master' of darcs.haskell.org//ghc