My fix to drupal core for http://drupal.org/node/932738 . Hopefully this...

My fix to drupal core for http://drupal.org/node/932738 .  Hopefully this makes it into the next release.

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x@226 20a16fea-79d4-4915-8869-1ea9d5ebf173