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

[dimitris at microsoft.com]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3887af198872718061d3136ef4cf2546fc3c4fba

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

commit 3887af198872718061d3136ef4cf2546fc3c4fba
Merge: f97b160... 3af4033...
Author: Dimitrios Vytiniotis <dimitris at microsoft.com>
Date:   Thu Jul 19 14:36:01 2012 +0200

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

 tests/concurrent/should_run/all.T                  |    4 +++-
 tests/perf/compiler/{T4007.stderr => T4007.stdout} |    0 
 2 files changed, 3 insertions(+), 1 deletions(-)