Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 19 Oct 2012 19:37:24 +0000 (20:37 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 19 Oct 2012 19:37:24 +0000 (20:37 +0100)

Trivial merge