Merge branch 'master' of http://darcs.haskell.org/testsuite
authorIan Lynagh <igloo@earth.li>
Wed, 19 Oct 2011 13:19:00 +0000 (14:19 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 19 Oct 2011 13:19:00 +0000 (14:19 +0100)

Trivial merge