From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Thu, 12 May 2011 07:48:07 +0000 (+0100)
Subject: Merge branch 'master' of http://darcs.haskell.org/ghc
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=e4a77504c3c5c39eeec191006cb11000b18c2d15

Merge branch 'master' of darcs.haskell.org/ghc
---

e4a77504c3c5c39eeec191006cb11000b18c2d15