Merged from trunk -r15407:15417

   Merged from trunk -r15407:15417

   | 15409   | Add missing newline to the "CONFIG_PROTECT is empty" warning |
   | zmedico | message.                                                     |

   | 15410   | Move portage.cpv_getkey() to the portage.versions module.    |
   | zmedico |                                                              |

   | 15411   | Add a note about --rebuilt-binaries.                         |
   | zmedico |                                                              |

   | 15412   | Handle CacheCorruption from self.db_ro in _setitem,          |
   | zmedico | triggered by INHERITED containing non-existent eclass inside |
   |         | metadata.database._parse_data. Thanks to Vlastimil Babka     |
   |         | <caster@g.o> for reporting.                                  |

   | 15413   | Move portage.flatten to portage.dep.flatten.                 |
   | zmedico |                                                              |

   | 15414   | Show a deprecation warning when digestParseFile() is called. |
   | zmedico |                                                              |

   | 15415   | Show a deprecation warning when pkgmerge() is called.        |
   | zmedico |                                                              |

   | 15416   | Show a deprecation warning when getvirtuals() is called.     |
   | zmedico |                                                              |

   | 15417   | Move the portage.FetchlistDict class to the                  |
   | zmedico | portage.dbapi.porttree module.                               |

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