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)
commit7e0984fb4e3bf25e6050ab6fecc98211ad9f3ecd
treeb1de8ffdcc8ebba98a88049b4d6a51a3b06a0749
parentdecc2725e1a5308cb53b5c29cf5917906da77b19
parentacfd22e03a9d611734df20d673f2804da682e223
Merge remote branch 'origin/master' into ghc-generics