Merge branch 'master' of mac:ghc/git/val32/.
authorIan Lynagh <ian@well-typed.com>
Fri, 14 Sep 2012 12:58:17 +0000 (13:58 +0100)
committerIan Lynagh <ian@well-typed.com>
Fri, 14 Sep 2012 12:58:17 +0000 (13:58 +0100)

Trivial merge