Drupal 6.28

There was a conflict in file.inc. Please review!