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

[Ian Lynagh]

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

On branch  : master

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

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

commit bcf55e05d6065d4e2c826e27bdd01f221b96dbe4
Merge: 20705df... 5ac223a...
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu Oct 6 20:03:11 2011 +0100

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

 compiler/coreSyn/CorePrep.lhs |   90 +++++++++++++++++----
 compiler/main/HscMain.lhs     |   17 +++-
 docs/users_guide/ghci.xml     |  176 ++++++++++++++++++++++++++++++----------
 ghc/InteractiveUI.hs          |    3 +-
 4 files changed, 222 insertions(+), 64 deletions(-)