Merge branch 'master' of darcs.haskell.org:/srv/darcs//testsuite
authorIan Lynagh <igloo@earth.li>
Fri, 20 Jul 2012 13:52:35 +0000 (14:52 +0100)
committerIan Lynagh <igloo@earth.li>
Fri, 20 Jul 2012 13:52:35 +0000 (14:52 +0100)

Trivial merge