From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Thu, 5 May 2011 08:00:27 +0000 (+0100)
Subject: Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=858cdd2f2725c75d35dabf7411dbafa932d84095

Merge branch 'ghc-generics' of darcs.haskell.org/ghc into ghc-generics
---

858cdd2f2725c75d35dabf7411dbafa932d84095