Merge branch 'master' of darcs.haskell.org:/srv/darcs//testsuite
authorIan Lynagh <igloo@earth.li>
Tue, 15 May 2012 16:10:42 +0000 (17:10 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 15 May 2012 16:10:42 +0000 (17:10 +0100)

Trivial merge