merge up to ghc HEAD 16-Apr-2011
authorAdam Megacz <megacz@cs.berkeley.edu>
Sat, 16 Apr 2011 23:56:37 +0000 (16:56 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Sun, 17 Apr 2011 01:21:58 +0000 (18:21 -0700)

No differences found