Test Trac #2354
Merge branch 'master' of http://darcs.haskell.org/testsuite