Merged from trunk -r15477:15489

   Merged from trunk -r15477:15489

   | 15486   | Add a --quiet-unmerge-warn option to disable the warning     |
   | zmedico | message that's shown prior to --unmerge actions. Thanks to   |
   |         | Thomas Sachau <tommy@gentoo.org> for the suggestion.         |

   | 15487   | Make _global_updates ensure that the binarytree is only      |
   | zmedico | populated with local packages (getbinpkgs=0), and fix        |
   |         | binarytree.populate() to behave properly when called more    |
   |         | than once.                                                   |

   | 15488   | Make bindbapi override cpv_inject and cpv_remove, for        |
   | zmedico | deleting stale values from self._aux_cache. Also, add a      |
   |         | comment about stale cache handling inside aux_update.        |

   | 15489   | Fix vardbapi.move_ent and aux_update to clear relevant       |
   | zmedico | caches.                                                      |

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