Merging Drupal 6.30

updated version # to 6.30