Merge branch 'master' of mac:ghc/git/val64/.
authorIan Lynagh <ian@well-typed.com>
Tue, 19 Mar 2013 00:37:04 +0000 (00:37 +0000)
committerIan Lynagh <ian@well-typed.com>
Tue, 19 Mar 2013 00:37:04 +0000 (00:37 +0000)

Trivial merge