[commit: haddock2] master: Merge remote branch 'origin/master' into ghc-new-co (797ab27)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/797ab27bdccf39c73ccad374fea265f124cb52ea

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

commit 797ab27bdccf39c73ccad374fea265f124cb52ea
Merge: 1d81436... 5a91450...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon May 2 12:05:03 2011 +0100

    Merge remote branch 'origin/master' into ghc-new-co

 src/Main.hs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)