From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Sat, 16 Apr 2011 23:56:37 +0000 (-0700)
Subject: merge up to ghc HEAD 16-Apr-2011
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=6cec61d14a324285dbb8ce73d4c7215f1f8d6766;hp=6cec61d14a324285dbb8ce73d4c7215f1f8d6766

merge up to ghc HEAD 16-Apr-2011
---