Merge branch 'master' of darcs.haskell.org:/srv/darcs//testsuite
authorIan Lynagh <ian@well-typed.com>
Sat, 16 Mar 2013 22:54:22 +0000 (22:54 +0000)
committerIan Lynagh <ian@well-typed.com>
Sat, 16 Mar 2013 22:54:22 +0000 (22:54 +0000)

Trivial merge