updates from drupal-6-union

to make future comparisons easier