Merging branches/drupal/Kew_BugFixing#r13341 through branches/drupal/Kew_BugFixing#r13654 into /home/andreas/workspaces/_svn-trunk/drupal/5.x
Merging branches/drupal/Kew_BugFixing#r13341 through branches/drupal/Kew_BugFixing#r13654 into /home/andreas/workspaces/_svn-trunk/drupal/5.x