Merge branch 'master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Fri, 30 Dec 2011 00:45:30 +0000 (16:45 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Fri, 30 Dec 2011 00:45:30 +0000 (16:45 -0800)
commit896d20fabdf0087e8dd33cc419a377b7a9adee88
tree6acfc745bb5d75ccc921af6521e5294d2d69da3f
parent42186dd64c22f23bbdb15a27e608cb52ba7d617f
parentb0c0205e3c0dfefc3ffbd49d22160ad5d624ee1f
Merge branch 'master' into type-nats

Conflicts:
compiler/typecheck/TcCanonical.lhs
compiler/typecheck/TcSMonad.lhs
compiler/hsSyn/HsTypes.lhs
compiler/iface/TcIface.lhs
compiler/parser/Parser.y.pp
compiler/parser/RdrHsSyn.lhs
compiler/typecheck/TcCanonical.lhs
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcEvidence.lhs
compiler/typecheck/TcHsType.lhs
compiler/typecheck/TcSplice.lhs
compiler/typecheck/TcType.lhs
compiler/types/TypeRep.lhs