updated to 6.30

updated the files from the core patch:

http://drupalcode.org/project/drupal.git/patch/203f323c8813f60c634ca23e025934d1527b0418