Index: includes/sitealias.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/sitealias.inc,v
retrieving revision 1.75
diff -u -p -r1.75 sitealias.inc
--- includes/sitealias.inc	25 Jan 2011 18:33:57 -0000	1.75
+++ includes/sitealias.inc	25 Jan 2011 21:16:17 -0000
@@ -650,6 +650,10 @@ function drush_sitealias_add_db_settings
       if (array_key_exists('name', $alias_record)) {
         $all_site_aliases =& drush_get_context('site-aliases');
         $all_site_aliases[$alias_record['name']] = $alias_record;
+	// Check and see if this record is a copy of 'self'
+	if (($alias_record['name'] != 'self') && array_key_exists('@self', $all_site_aliases) && ($all_site_aliases['@self']['name'] == $alias_record['name'])) {
+          $all_site_aliases['@self'] = $alias_record;
+	}
       }
     }
   }