synchronizing with v2 of the Drupal 6 files in Drupal.org