Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 18 Mar 2013 12:51:32 +0000 (12:51 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 18 Mar 2013 12:51:32 +0000 (12:51 +0000)

Trivial merge