Merged from trunk -r15193:15199

   Merged from trunk -r15193:15199

   | 15194   | Avoid portage import in order to avoid a potential sandbox   |
   | zmedico | violation if portage's *.pyc files are stale.                |

   | 15195   | Fix unicode quote handling to work with python3.             |
   | zmedico |                                                              |

   | 15196   | Fix output handling to avoid potential UnicodeEncodeError.   |
   | zmedico |                                                              |

   | 15197   | Use encoded byte strings with python-2.x, since the python   |
   | zmedico | ebuilds are known to remove the encodings module when        |
   |         | USE=build is enabled (thus disabling unicode                 |
   |         | decoding/encoding).                                          |

   | 15198   | Bug #300744 - Inside xpak(), exclude CONTENTS for quickpkg   |
   | zmedico | since contents is generated by the merge process.            |

   | 15199   | Make sure repoman knows about all files in the directory to  |
   | grobian | commit using bzr. Patch by Christian Faulhammer.             |

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