Merge remote branch 'origin/master' into ghc-generics
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 19 May 2011 07:38:35 +0000 (08:38 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 19 May 2011 07:38:35 +0000 (08:38 +0100)
commitd48f6ea757640cc26b3d3e215bed750f5bf1021b
tree65ec3051192b5ab7af8f12a8bee645580d5832a2
parent741a5e37316ba4f23c7b01c224d9728a35e0bb72
parent036830b392a9cceab2ddb7b2abb13ed8c4015dfd
Merge remote branch 'origin/master' into ghc-generics