From: Adam Megacz <adam@megacz.com>
Date: Mon, 25 Apr 2011 00:31:58 +0000 (-0700)
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=1c6d61ee06972de3c4797e1925e265f7dc7c361c

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

1c6d61ee06972de3c4797e1925e265f7dc7c361c