Merge remote branch 'origin/master' into ghc-generics
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 11:55:29 +0000 (12:55 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 11:55:29 +0000 (12:55 +0100)
commitc9d713bca9ce31fed25d7201464bad48f0dbc647
tree9354b6e566e04675354dd14edf626f421365c801
parent02fa8eafaae87b1d2e8b6f1f34b7d6b1af1da58f
parent25fa4bdbff4a84d6717c4ff7cdf7080687616818
Merge remote branch 'origin/master' into ghc-generics
compiler/hsSyn/HsBinds.lhs
compiler/rename/RnBinds.lhs
compiler/typecheck/TcDeriv.lhs
compiler/typecheck/TcGenDeriv.lhs