Index: includes/path.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/path.inc,v
retrieving revision 1.19.2.1
diff -r1.19.2.1 path.inc
69c69
<       $alias = db_result(db_query("SELECT dst FROM {url_alias} WHERE src = '%s' AND language IN('%s', '') ORDER BY language DESC", $path, $path_language));
---
>       $alias = db_result(db_query("SELECT dst FROM {url_alias} WHERE src = '%s' AND language IN('%s', '') ORDER BY language DESC, pid DESC", $path, $path_language));
80c80
<         if ($src = db_result(db_query("SELECT src FROM {url_alias} WHERE dst = '%s' AND language IN('%s', '') ORDER BY language DESC", $path, $path_language))) {
---
>         if ($src = db_result(db_query("SELECT src FROM {url_alias} WHERE dst = '%s' AND language IN('%s', '') ORDER BY language DESC, pid DESC", $path, $path_language))) {
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.238.2.15
diff -r1.238.2.15 system.install
1096c1096
<     'unique keys' => array('dst_language' => array('dst', 'language')),
---
>     'unique keys' => array('dst_language_pid' => array('dst', 'language', 'pid')),
1098c1098
<     'indexes' => array('src_language' => array('src', 'language')),
---
>     'indexes' => array('src_language_pid' => array('src', 'language', 'pid')),
2600a2601,2612
>  * Improve indexes on the {url_alias} table.
>  */
> function system_update_6052() {
>   $ret = array();
>   db_drop_index($ret, 'url_alias', 'src_language');
>   db_drop_index($ret, 'url_alias', 'dst_language');
>   db_add_index($ret, 'url_alias', 'dst_language_pid', array('dst', 'language', 'pid'));
>   db_add_index($ret, 'url_alias', 'src_language_pid', array('src', 'language', 'pid'));
>   return $ret;
> }
> 
> /**