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)
1  2 
compiler/coreSyn/CoreUnfold.lhs
compiler/types/Type.lhs

Simple merge
Simple merge