Merge branch 'master' of darcs.haskell.org:/srv/darcs//testsuite
authorIan Lynagh <igloo@earth.li>
Wed, 27 Jun 2012 20:53:39 +0000 (21:53 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 27 Jun 2012 20:53:39 +0000 (21:53 +0100)

Trivial merge