Merging from trunk to testing

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

.htaccess.sample

@@ -65,7 +65,7 @@ DirectoryIndex index.php index.html index.htm
   # THIS SECTION IS AUTOMATICALY GENERATED.
   # DO NOT EDIT!!!!
   
-  RewriteRule .*/cron cron.php
+  RewriteRule .*/cron.php cron.php
   RewriteRule .*/update.php update.php
   
   # %UNL_CREATION_TOOL_STUB%