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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit f2b3b9b224e5ffc845086e9ba648f8cdd51e7598
Merge: f63bd3f... a67505b...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jul 29 13:12:36 2011 +0100

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

 tests/plugins/LinkerTicklingPlugin.hs |    4 +++-
 tests/plugins/all.T                   |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)