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

[dimitris at microsoft.com]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3585091c5bd7757d5e62b648f425d3ca93aaee68

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

commit 3585091c5bd7757d5e62b648f425d3ca93aaee68
Merge: 8e59b71... c6b350b...
Author: Dimitrios.Vytiniotis <dimitris at microsoft.com>
Date:   Wed Apr 4 17:04:07 2012 +0100

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

 tests/typecheck/should_compile/tc145.hs  |    2 +-
 tests/typecheck/should_compile/tc158.hs  |    2 +-
 tests/typecheck/should_compile/tc230.hs  |    2 +-
 tests/typecheck/should_fail/T2714.hs     |    2 +-
 tests/typecheck/should_fail/T5957.hs     |    4 ++++
 tests/typecheck/should_fail/T5957.stderr |    6 ++++++
 tests/typecheck/should_fail/all.T        |    1 +
 7 files changed, 15 insertions(+), 4 deletions(-)