Merged from trunk -r14087:14097

   Merged from trunk -r14087:14097

   | 14088   | Use _content_encoding where appropriate.                     |
   | zmedico |                                                              |

   | 14089   | Use the new portage.output._init(config_root) function.      |
   | zmedico |                                                              |

   | 14090   | Use _content_encoding and _fs_encoding, and use strict       |
   | zmedico | unicode exceptions where appropriate.                        |

   | 14091   | Replace the _{content,fs,merge}_encoding attributes with an  |
   | zmedico | _encodings dict.                                             |

   | 14092   | Use errors='backslashreplace' instead of 'replace' for the   |
   | zmedico | default _unicode_encode() argument ('replace' substitutes    |
   |         | '?', which is not as useful).                                |

   | 14093   | Use portage.os and _encodings['fs'] where appropriate.       |
   | zmedico |                                                              |

   | 14094   | Use portage.os and _encodings where appropriate.             |
   | zmedico |                                                              |

   | 14095   | Use portage.os and _encodings where appropriate.             |
   | zmedico |                                                              |

   | 14096   | Remove unused os import.                                     |
   | zmedico |                                                              |

   | 14097   | Use portage.os and _encodings where appropriate.             |
   | zmedico |                                                              |

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