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

[dimitris at microsoft.com]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ae06d90ea5eeea05c511660164aa9da8fb73f711

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

commit ae06d90ea5eeea05c511660164aa9da8fb73f711
Merge: 3585091... 44b4cb0...
Author: Dimitrios.Vytiniotis <dimitris at microsoft.com>
Date:   Thu Apr 5 09:04:29 2012 +0100

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

 tests/safeHaskell/check/pkg01/ImpSafe01.stderr     |    3 ++-
 tests/safeHaskell/check/pkg01/ImpSafeOnly03.stderr |    3 ++-
 tests/safeHaskell/flags/SafeFlags17.stderr         |    3 ++-
 tests/safeHaskell/flags/SafeFlags22.stderr         |    4 +++-
 tests/safeHaskell/flags/SafeFlags23.stderr         |    4 +++-
 .../safeHaskell/safeInfered/UnsafeInfered01.stderr |    3 ++-
 .../safeHaskell/safeInfered/UnsafeInfered02.stderr |    3 ++-
 .../safeHaskell/safeInfered/UnsafeInfered03.stderr |    3 ++-
 .../safeHaskell/safeInfered/UnsafeInfered05.stderr |    3 ++-
 .../safeHaskell/safeInfered/UnsafeInfered06.stderr |    3 ++-
 .../safeHaskell/safeInfered/UnsafeInfered07.stderr |    3 ++-
 .../safeHaskell/safeInfered/UnsafeInfered08.stderr |    3 ++-
 .../safeHaskell/safeInfered/UnsafeInfered09.stderr |    3 ++-
 .../safeHaskell/safeInfered/UnsafeInfered10.stderr |    3 ++-
 .../safeHaskell/safeInfered/UnsafeInfered11.stderr |    8 +++++---
 tests/safeHaskell/unsafeLibs/BadImport01.stderr    |    3 ++-
 tests/safeHaskell/unsafeLibs/BadImport04.stderr    |    2 +-
 tests/safeHaskell/unsafeLibs/BadImport05.stderr    |    3 ++-
 tests/safeHaskell/unsafeLibs/BadImport06.stderr    |    3 ++-
 tests/safeHaskell/unsafeLibs/BadImport07.stderr    |    3 ++-
 tests/safeHaskell/unsafeLibs/BadImport08.stderr    |    3 ++-
 tests/safeHaskell/unsafeLibs/BadImport09.stderr    |    3 ++-
 tests/safeHaskell/unsafeLibs/Dep05.stderr          |    2 +-
 tests/safeHaskell/unsafeLibs/Dep06.stderr          |    2 +-
 tests/safeHaskell/unsafeLibs/Dep07.stderr          |    3 ++-
 tests/safeHaskell/unsafeLibs/Dep08.stderr          |    3 ++-
 tests/safeHaskell/unsafeLibs/Dep09.stderr          |    2 +-
 tests/safeHaskell/unsafeLibs/Dep10.stderr          |    2 +-
 28 files changed, 56 insertions(+), 30 deletions(-)