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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit cbb0932f22fd8a06ef8cb760b9457a7643a0b1df
Merge: 258c531... 7f4f3e3...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jan 20 22:44:06 2012 +0000

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

 tests/ghc-api/apirecomp001/apirecomp001.stderr |   40 ++++++++++++------------
 1 files changed, 20 insertions(+), 20 deletions(-)