From: Simon Peyton Jones <simonpj@microsoft.com>
Date: Mon, 9 May 2011 17:10:57 +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=2d5205118357cac8a2dd43b33bcd93a3c00f5558

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

2d5205118357cac8a2dd43b33bcd93a3c00f5558