This commit was manufactured as part of Drupal's Great Git Migration to

create branch 'DRUPAL-5'.

Cherrypick from master 2007-01-31 17:45:25 UTC Derek Wright <git@dwwright.net> '#110857 by rotzi (with some changes by dww): complete re-write of the':
    DiffEngine.php
    cck.inc
    diff.install
    node.inc
    taxonomy.inc
    upload.inc