[commit: testsuite] master: Merge branch 'master' of http://darcs.haskell.org/testsuite (8cc7d30)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8cc7d305f72345b69946abc09918d8db50d44e0c

>---------------------------------------------------------------

commit 8cc7d305f72345b69946abc09918d8db50d44e0c
Merge: fbb1f16... 33b028b...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jan 12 16:31:12 2012 +0000

    Merge branch 'master' of http://darcs.haskell.org/testsuite

 tests/concurrent/2317/all.T |    2 +-
 tests/perf/compiler/all.T   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)