Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 6 Feb 2013 12:54:33 +0000 (12:54 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 6 Feb 2013 12:54:33 +0000 (12:54 +0000)
1  2 
compiler/typecheck/TcUnify.lhs
compiler/types/Coercion.lhs
compiler/types/TypeRep.lhs

Simple merge
Simple merge
Simple merge