Merged from trunk -r11472:11475

   Merged from trunk -r11472:11475

   | 11473   | Fix _ObjectKey.__eq__() to account for potential hash        |
   | zmedico | collisions that would break dict behavior. Thanks to Lucian  |
   |         | Poston for spotting this.                                    |

   | 11474   | Revert recent changes to _ObjectKey.__eq__() since it's      |
   | zmedico | probably a bug if the wrong type is compared for equality    |
   |         | anyway.                                                      |

   | 11475   | When reloading the emerge config due to global updates in    |
   | zmedico | action_sync(), correctly update the local root_config        |
   |         | reference. This should fix a KeyError: 'porttree' exception  |
   |         | that's been reported to be triggered after --sync.           |

svn path=/main/branches/prefix/; revision=11477