Merge branch 'master' of dippy:c:/msys/1.0/home/ian/ghc/.
authorIan Lynagh <igloo@earth.li>
Fri, 14 Oct 2011 15:25:31 +0000 (16:25 +0100)
committerIan Lynagh <igloo@earth.li>
Fri, 14 Oct 2011 15:25:31 +0000 (16:25 +0100)

Trivial merge