Merging Drupal 6.30

new schema and update function to put it into place.