Merge branch 'master' of http://darcs.haskell.org/testsuite
authorDavid Terei <davidterei@gmail.com>
Fri, 10 Feb 2012 18:35:40 +0000 (10:35 -0800)
committerDavid Terei <davidterei@gmail.com>
Fri, 10 Feb 2012 18:35:40 +0000 (10:35 -0800)

Trivial merge