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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit d409eb10324dd50d429f418104a217cd1de3e3ec
Merge: a809d17... cc85262...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jun 12 08:43:17 2012 +0100

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

 tests/safeHaskell/check/pkg01/safePkg01.stdout     |    2 +-
 tests/safeHaskell/flags/SafeFlags22.stderr         |    4 ++--
 tests/safeHaskell/flags/SafeFlags23.stderr         |    4 ++--
 tests/safeHaskell/flags/SafeFlags25.stderr         |    4 ++--
 tests/safeHaskell/flags/SafeFlags26.stderr         |    4 ++--
 .../safeHaskell/safeInfered/UnsafeInfered11.stderr |    2 +-
 .../safeHaskell/safeInfered/UnsafeInfered12.stderr |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)