From: Adam Megacz <adam@megacz.com>
Date: Tue, 31 May 2011 02:34:22 +0000 (-0700)
Subject: merge GHC HEAD
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b2524b3960999fffdb3767900f58825903f6560f;hp=b2524b3960999fffdb3767900f58825903f6560f;p=ghc-hetmet.git

merge GHC HEAD
---