Merge in changes from HEAD
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 2 May 2011 09:25:36 +0000 (10:25 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 2 May 2011 09:25:36 +0000 (10:25 +0100)
commitdb4f42a8e38bfead11f5af78557e18b9f42b10b3
tree14ae7a4f024bdae8aea214e6f3c79604d13fad33
parent15bea1b740be3d5ee755e0e7a7b214b587ad2205
parent25fa4bdbff4a84d6717c4ff7cdf7080687616818
Merge in changes from HEAD
compiler/hsSyn/HsBinds.lhs
compiler/rename/RnBinds.lhs
compiler/typecheck/TcBinds.lhs
compiler/typecheck/TcDeriv.lhs
compiler/typecheck/TcGenDeriv.lhs
compiler/typecheck/TcSMonad.lhs
compiler/typecheck/TcSimplify.lhs
compiler/types/OptCoercion.lhs
compiler/types/TypeRep.lhs