Merge branch 'master' of darcs.haskell.org:/srv/darcs//testsuite
authorIan Lynagh <ian@well-typed.com>
Fri, 5 Oct 2012 00:14:47 +0000 (01:14 +0100)
committerIan Lynagh <ian@well-typed.com>
Fri, 5 Oct 2012 00:14:47 +0000 (01:14 +0100)

Trivial merge