patch applied (packages/Cabal): resolve conflicts from henning-thielemann' s work. Thanks Henning!

[Isaac Jones]

Sat Jul  8 11:50:16 PDT 2006  ijones at syntaxpolice.org
  * resolve conflicts from henning-thielemann's work.  Thanks Henning!

    M ./Distribution/Simple.hs -3 +7
    M ./Distribution/Simple/Install.hs -15 +8
    M ./Distribution/Simple/Register.hs -3 +12
    M ./Distribution/Simple/Utils.hs -6 +4