Merge branch 'master' of dippy:c:/msys/1.0/home/ian/ghc/.
authorIan Lynagh <igloo@earth.li>
Fri, 17 Jun 2011 18:12:06 +0000 (19:12 +0100)
committerIan Lynagh <igloo@earth.li>
Fri, 17 Jun 2011 18:12:06 +0000 (19:12 +0100)

Trivial merge