Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Jul 2012 19:09:58 +0000 (20:09 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Jul 2012 19:09:58 +0000 (20:09 +0100)
commit60ee7636f8f7cc8e6491f0a4f4c04ceab645268c
tree8621cc41d8fa8436490e27ffeffcfe8686190421
parent0b20ae911c7c7f6633246b199fc485ecc3d65458
parenta0ba88bef62af0e7f91720ac6ad71850078fd718
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
compiler/coreSyn/CoreUnfold.lhs
compiler/types/Type.lhs