Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 24 Jan 2013 15:46:20 +0000 (15:46 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 24 Jan 2013 15:46:20 +0000 (15:46 +0000)
1  2 
compiler/basicTypes/DataCon.lhs
compiler/types/Coercion.lhs

Simple merge
Simple merge