From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Wed, 4 May 2011 22:10:42 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=e547763831119858a06f99cda885ab9f96681394

Merge remote branch 'origin/master'
---

e547763831119858a06f99cda885ab9f96681394