From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Wed, 20 Apr 2011 10:32:05 +0000 (+0100)
Subject: Merge branch 'master' into ghc-new-co
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=39bb1bd24f56d1abd9961813d9cd94b61c9d4c78;p=ghc-hetmet.git

Merge branch 'master' into ghc-new-co
---

39bb1bd24f56d1abd9961813d9cd94b61c9d4c78