Updating upload.module patch so that it applies agains current CVS. Closes http://drupal.org/node/19841