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

Merge remote-tracking branch 'origin/master'
---

aca4fde66f74bdb882e9151cd65ef8092246def1