From: unknown <simonpj@.europe.corp.microsoft.com>
Date: Wed, 13 Apr 2011 08:18:39 +0000 (+0100)
Subject: Merge branch 'master' of c:/code/HEAD-git/. into ghc-generics
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=8419203b7eb5aa4bb13f8d1263632de4d10a4048

Merge branch 'master' of c:/code/HEAD-git/. into ghc-generics
---

8419203b7eb5aa4bb13f8d1263632de4d10a4048