Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 30 Jan 2013 14:29:20 +0000 (14:29 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 30 Jan 2013 14:29:20 +0000 (14:29 +0000)
commitdd86634af16956f555b228948acc578d678219b4
tree314422e13d45aa53f09092064e2f9e2a57697342
parent677144b858f4a425e77399bdfbfcd43dbabd1488
parent9c6dd15b206bddc860a537cc059284ba4b6aa80f
Merge branch 'master' of darcs.haskell.org/ghc

Conflicts:
compiler/types/Coercion.lhs
compiler/coreSyn/CoreSyn.lhs
compiler/types/Coercion.lhs
compiler/types/FamInstEnv.lhs
compiler/types/Type.lhs