Merge branch 'master' of mac:ghc/git/val32/.
authorIan Lynagh <igloo@earth.li>
Wed, 26 Oct 2011 17:22:47 +0000 (18:22 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 26 Oct 2011 17:22:47 +0000 (18:22 +0100)

Trivial merge