Merge branch 'master' into ghc-generics
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 11:13:44 +0000 (12:13 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 11:13:44 +0000 (12:13 +0100)
commit02fa8eafaae87b1d2e8b6f1f34b7d6b1af1da58f
treec1a32a67b0e4d99f63b28001e53bcfc5e59f88b9
parent9dcc8bb7a8d4a239c28975c819a9e1267663a530
parent44fbccd667455a26551e72a9a5c5fe114f35d932
Merge branch 'master' into ghc-generics