From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Mon, 13 Jun 2011 14:08:15 +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=c1c2c25355bc462e521b2c5fb41ac79307da22ff

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

c1c2c25355bc462e521b2c5fb41ac79307da22ff