Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 7 Jan 2013 11:37:32 +0000 (11:37 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 7 Jan 2013 11:37:32 +0000 (11:37 +0000)

Trivial merge