From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Wed, 20 Apr 2011 11:27:31 +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=25fa4bdbff4a84d6717c4ff7cdf7080687616818

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

25fa4bdbff4a84d6717c4ff7cdf7080687616818