Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Sat, 24 Mar 2012 22:28:26 +0000 (22:28 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Sat, 24 Mar 2012 22:28:26 +0000 (22:28 +0000)

Trivial merge