From: Jose Pedro Magalhaes <jpm@cs.uu.nl>
Date: Thu, 5 May 2011 11:31:09 +0000 (+0200)
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=b5070429b2d284107b828da0cd45e5eb69128b6b

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

b5070429b2d284107b828da0cd45e5eb69128b6b