From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Fri, 6 May 2011 14:56:06 +0000 (+0100)
Subject: Merge master into the ghc-new-co branch
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=ca53c38335cdc671f0b1e0949aa1514fc3fd72a5;hp=ca53c38335cdc671f0b1e0949aa1514fc3fd72a5

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