From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Fri, 10 Jun 2011 18:54:49 +0000 (+0100)
Subject: Merge branch 'master' of http://darcs.haskell.org/ghc
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7b5b3b0cab463e108a0132435a28ef19d17cb32b;p=ghc-hetmet.git

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

7b5b3b0cab463e108a0132435a28ef19d17cb32b