[gh-85] Merging from testing into staging

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

sites/all/modules/unl/unl_migration.php

@@ -750,6 +750,10 @@ class Unl_Migration_Tool
         $node->title = $title;
         $node->language = 'und';
         $node->path['alias'] = $alias;
+        if (module_exists('pathauto')) {
+          $node->path['pathauto'] = FALSE;
+        }
+        $node->path['pathauto'] = FALSE;
         $node->body = array(
             'und' => array(
                 array(