Merge branch 'master' of mac:ghc/git/val32/.
authorIan Lynagh <igloo@earth.li>
Mon, 27 Jun 2011 12:54:40 +0000 (13:54 +0100)
committerIan Lynagh <igloo@earth.li>
Mon, 27 Jun 2011 12:54:40 +0000 (13:54 +0100)

Trivial merge