From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Thu, 19 May 2011 07:38:35 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into ghc-generics
X-Git-Url: http://git.megacz.com/?p=ghc-base.git;a=commitdiff_plain;h=7e0984fb4e3bf25e6050ab6fecc98211ad9f3ecd

Merge remote branch 'origin/master' into ghc-generics
---

7e0984fb4e3bf25e6050ab6fecc98211ad9f3ecd