Merge remote branch 'origin/master' into ghc-generics
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 13:33:23 +0000 (14:33 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 13:33:23 +0000 (14:33 +0100)
commit54fb2efb814fc5f65d3699e7a495b9c050729d58
treebf4ad82b372fb12e0ee5eb65223fa8ffb49726ff
parent0d363cf82a46a55b7d0b407fb667f9ea9756a578
parent8073392a94dc5ab198e4758d6738a0c7f5ed68cf
Merge remote branch 'origin/master' into ghc-generics