Merged from trunk -r13640:13652

   Merged from trunk -r13640:13652

   | 13641   | Misc fixes and updates. Thanks to Sebastian Mingramm (few)   |
   | zmedico | <s.mingramm@gmx.de> for this patch from bug #274279.         |

   | 13642   | Escape hyphens from previous commit.                         |
   | zmedico |                                                              |

   | 13643   | Bug #274279 - Add color.map support for mapping a color to a |
   | zmedico | different color (rather than just mapping a class/style to a |
   |         | different color). Thanks to Sebastian Mingramm (few)         |
   |         | <s.mingramm@gmx.de> for this patch.                          |

   | 13644   | Use map_code_to_color_code() where appropriate inside        |
   | zmedico | ConsoleStyleFile.write().                                    |

   | 13645   | Add epydoc docstrings fro codes and color_codes variables.   |
   | zmedico |                                                              |

   | 13646   | Rename map_code_to_color_code() to style_to_ansi_code().     |
   | zmedico |                                                              |

   | 13647   | Rename codes to _styles.                                     |
   | zmedico |                                                              |

   | 13648   | Rename color_codes back to codes.                            |
   | zmedico |                                                              |

   | 13649   | Add NOCOLOR to the environment whitelist. This fixes         |
   | zmedico | inappropriate colors produced by elog functions. Thanks to   |
   |         | Luis F. Araujo <araujo@gentoo.org> for reporting.            |

   | 13650   | When --pretend overrides --ask, don't show any output.       |
   | zmedico |                                                              |

   | 13651   | Allow missing ChangeLog when using git. We don't use         |
   | zmedico | ChangeLogs in distributed SCMs. It will be generated on      |
   |         | server side from scm log, before package moves to the rsync  |
   |         | server. This is needed because we try to avoid merge         |
   |         | collisions. Thanks to Tomas Chvatal <scarabeus@gentoo.org>   |
   |         | for this patch.                                              |

   | 13652   | Add a EMERGE_LOG_DIR variable to control the location of     |
   | zmedico | emerge.log and emerge-fetch.log. This was requested by Eitan |
   |         | Mosenkis <eitan@mosenkis.net> for use in his 'online image   |
   |         | builder' soc project.                                        |

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