Change wording of "main is not defined in Main" message (Trac #7816)
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
Improve the "main is not defined in Main" message a bit further
Make the desugarer a tiny bit cleverer on coercions (fixes Trac #7837)

The desugarer was generating a redundant box/unbox pair on the
LHS of a RULE, which in turn made matching fail.

See Note [Simple coercions] in DsBinds.
Comments and debug output only
Remove accidentally-inserted tabs
Allow partial applications of a type synonym in :kind in GHCi (Trac #7586)

Documentation is done too
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc