Index: path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.138.2.2
diff -u -r1.138.2.2 path.module
--- path.module	21 Jun 2008 18:22:53 -0000	1.138.2.2
+++ path.module	13 Aug 2008 18:08:43 -0000
@@ -105,7 +105,12 @@
     if ($alias == drupal_get_path_alias($path, $language)) {
       // There is already such an alias, neutral or in this language.
       // Update the alias based on alias; setting the language if not yet done.
-      db_query("UPDATE {url_alias} SET src = '%s', dst = '%s', language = '%s' WHERE dst = '%s'", $path, $alias, $language, $alias);
+      if($language) {
+        db_query("UPDATE {url_alias} SET src = '%s', dst = '%s' WHERE dst = '%s' AND language = '%s'", $path, $alias, $alias, $language);
+      }
+      else {
+      	db_query("UPDATE {url_alias} SET src = '%s', dst = '%s', language = '%s' WHERE dst = '%s'", $path, $alias, $language, $alias);
+      }
     }
     else {
       // A new alias. Add it to the database.