Merged from trunk -r14455:14463

   Merged from trunk -r14455:14463

   | 14458   | Bug #286780 - Fix email.MIME* imports to use email.mime.*    |
   | zmedico | (works with python 2.6 and python 3). Thanks to Hanno        |
   |         | Meyer-Thurow <h.mth@web.de> for this patch.                  |

   | 14459   | Don't call self.scan() in tbz2.__init__ since all methods    |
   | zmedico | call it anyway.                                              |

   | 14460   | Make tbz2.get_data() return an empty dict on failure.        |
   | zmedico |                                                              |

   | 14461   | Handle encoding/decoding of unicode when using the xpak api. |
   | zmedico | Use tbz2.get_data() instead of tbz2.getfile() when reading   |
   |         | multiple values, in order to avoid multiple tbz2.scan() and  |
   |         | searchindex() calls.                                         |

   | 14462   | Add back _PackageMetadataWrapper__setitem__, removed in      |
   | zmedico | r14280, since removing it seems to cause problems. Thanks to |
   |         | Jeremy Olexa <darkside@gentoo.org> for reporting, and Marat  |
   |         | Radchenko <marat@slonopotamus.org> for bisecting to find the |
   |         | revision.                                                    |

   | 14463   | Revert the rest of r14280 since it seems that dict bypasses  |
   | zmedico | __getitem__ and/or __setitem__ too often.                    |

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