From: Max Bolingbroke <batterseapower@hotmail.com>
Date: Sun, 3 Apr 2011 15:55:20 +0000 (+0100)
Subject: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=1ecf3fd2a39e43fddc4f89f3bc1079a426f11142

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

1ecf3fd2a39e43fddc4f89f3bc1079a426f11142