Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Jan 2012 22:44:06 +0000 (22:44 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Jan 2012 22:44:06 +0000 (22:44 +0000)

Trivial merge