Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 26 Mar 2012 08:16:52 +0000 (09:16 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 26 Mar 2012 08:16:52 +0000 (09:16 +0100)

Trivial merge