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

Trivial merge