Merged from trunk -r14097:14107

   Merged from trunk -r14097:14107

   | 14098    | Use _encodings['repo.content'] for decoding profiles.desc,  |
   | zmedico  | ChangeLog, metadata.xml, and ebuilds.                       |

   | 14099    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14100    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14101    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14102    | If sys.getdefaultencoding() returns None (this can happen   |
   | zmedico  | if python is built with USE=build, in stage 1), fall back   |
   |          | to _encodings['merge'] = 'ascii'.                           |

   | 14103    | Fix typo from previous commit.                              |
   | zmedico  |                                                             |

   | 14104    | Fix portage.5 man page to document the fact that some files |
   | arfrever | in profiles directory can be directories.                   |

   | 14105    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14106    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

   | 14107    | Use _encodings where appropriate.                           |
   | zmedico  |                                                             |

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