Merged from trunk -r14296:14306

   Merged from trunk -r14296:14306

   | 14297   | Add back a line which I erroneously removed when committing  |
   | zmedico | the patch for bug 203733. Thanks to Alexis Ballier           |
   |         | <aballier@g.o> for reporting the related KeyError.           |

   | 14298   | In doebuild_environment(), detect if setcpv() hasn't been    |
   | zmedico | called properly, and call it if necessary (mainly for api    |
   |         | consumers).                                                  |

   | 14299   | Make _unicode_module_wrapper cache wrappers and reuse them.  |
   | zmedico | Thanks to Marat Radchenko <marat@slonopotamus.org> for this  |
   |         | patch from bug #276813.                                      |

   | 14300   | Make Atom inherit from str. Thanks to Marat Radchenko        |
   | zmedico | <marat@slonopotamus.org> for this patch from bug #276813.    |

   | 14301   | Use _unicode_encode() to ensure that only unicode strings    |
   | zmedico | are passed into io.StringIO text streams.                    |

   | 14302   | Misc unicode fixes for repoman.                              |
   | zmedico |                                                              |

   | 14303   | Add support in ConsoleStyleFile.write() for unicode encoding |
   | zmedico | when writing to stdout/stderr in python-2.x.                 |

   | 14304   | Add fallback in ImportError for io.StringIO. This is needed  |
   | zmedico | for python-2.6 with USE=build since io imports threading     |
   |         | which imports thread which is unavailable.                   |

   | 14305   | Fix depgraph._validate_blockers() so that it doesn't do      |
   | zmedico | prohibited Atom(Atom) constructor calls.                     |

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

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