From: Jose Pedro Magalhaes <jpm@cs.uu.nl>
Date: Thu, 26 May 2011 16:27:34 +0000 (+0200)
Subject: Merge branch 'ghc-generics'
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=cb2d37da5792b13f5988049f67a24263b4de4ff2

Merge branch 'ghc-generics'
---

cb2d37da5792b13f5988049f67a24263b4de4ff2