updates to support Drupal 6 that actually include what was in the latest DRUPAL-5 branch since it wasn't synced with HEAD