From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Wed, 11 May 2011 16:28:26 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=cd54b707b0d77a3c62ee9f57b82dae98727f1c34;hp=-c

Merge remote branch 'origin/master'
---

cd54b707b0d77a3c62ee9f57b82dae98727f1c34