patch applied (ghc-6.8/ghc): MERGED: always try to remove the new file before restoring the old one (#1963)

[Ian Lynagh]

Sun Jan  6 06:52:28 PST 2008  Ian Lynagh <igloo at earth.li>
  * MERGED: always try to remove the new file before restoring the old one (#1963)
  Simon Marlow <simonmar at microsoft.com>**20071214123345

    M ./utils/ghc-pkg/Main.hs -7 +6