This patch has been delayed because the Drupal 5 code had changed by the time Drumm got to it. Would someone please confirm that it now applies correctly before the code changes again?