patch applied (ghc): Adjust code from manual merges

[Ian Lynagh]

Mon Dec 11 08:20:27 PST 2006  Pepe Iborra <mnislaih at gmail.com>
  * Adjust code from manual merges

    M ./compiler/deSugar/DsBreakpoint.lhs -30 +31
    A ./compiler/ghci/ByteCodeLink.lhs-boot
    M ./compiler/ghci/GhciMonad.hs -5 +6
    M ./compiler/main/Breakpoints.hs +2
    M ./compiler/main/DynFlags.hs -2 +6
    M ./compiler/main/GHC.hs -3 +3
    A ./compiler/typecheck/TcEnv.lhs-boot
    M ./compiler/typecheck/TcRnDriver.lhs -1 +1
    M ./rts/Linker.c -11 +1