Merged from trunk -r14306:14313

   Merged from trunk -r14306:14313

   | 14307   | Fix typos in http.client imports.                            |
   | zmedico |                                                              |

   | 14308   | Remove virtuals from the cache because they're unused since  |
   | zmedico | portage-2.1.6 and it won't hurt older portage.               |

   | 14309   | Fix redundant Atom construtor call in                        |
   | zmedico | _show_unsatisfied_dep().                                     |

   | 14310   | Tread blockers as invalid.                                   |
   | zmedico |                                                              |

   | 14311   | Fix AtomArg constructor calls to pass in Atom instances, so  |
   | zmedico | the constructor never has to construct one.                  |

   | 14312   | When generating config.prevmaskdict, only call the Atom      |
   | zmedico | constructor when necessary.                                  |

   | 14313   | Make Atom.__init__ call the base class constructor, though   |
   | zmedico | it doesn't seem to matter.                                   |

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