From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Wed, 20 Apr 2011 17:29:56 +0000 (-0700)
Subject: merge upstream HEAD
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=cf5905ea24904cf73a041fd7535e8723a668cb9a

merge upstream HEAD
---

cf5905ea24904cf73a041fd7535e8723a668cb9a