From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Thu, 26 May 2011 13:33:23 +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=54fb2efb814fc5f65d3699e7a495b9c050729d58

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

54fb2efb814fc5f65d3699e7a495b9c050729d58