Merged from trunk 10654:10690

   Merged from trunk 10654:10690

   | 10656   | Fix config._accept_chost_re so it's only an instance         |
   | zmedico | variable.                                                    |

   | 10658   | Add some write access checks in post_merge() in order to     |
   | zmedico | avoid triggering permission related exceptions.              |

   | 10659   | Make some post_merge() things conditional on the vdb lock    |
   | zmedico | being held (mtimedb commit and info dirs processing).        |

   | 10660   | Bug #223417 - Due to 1 second mtime granularity in <         |
   | zmedico | python-1.5, mtime checks are not always sufficient to        |
   |         | invalidate vardbapi caches. Therefore, the caches need to be |
   |         | actively invalidated when packages are added and removed.    |

   | 10661   | Re-enable vardbapi.cpv_all() cache now that bug #223417 is   |
   | zmedico | solved.                                                      |

   | 10669   | Tweak the config._accept_chost() regex.                      |
   | zmedico |                                                              |

   | 10671   | Document the new ACCEPT_CHOSTS variable.                     |
   | zmedico |                                                              |

   | 10673   | Fix typo.                                                    |
   | zmedico |                                                              |

   | 10675   | Add support for an new "eblank" elog function that shows a   |
   | zmedico | blank line. Consecutive eblank calls are all collapsed into  |
   |         | a single blank line. Thanks to Joe Peterson <lavajoe@g.o>    |
   |         | for this patch.                                              |

   | 10677   | * Rename NEUTRAL color to BLANK for eblank. * Document the   |
   | zmedico | new BLANK code in color.map.5. * Implement python version of |
   |         | eblank for mod_echo.                                         |

   | 10679   | Fix BLANK order and color.                                   |
   | zmedico |                                                              |

   | 10681   | Add "blank" to the default PORTAGE_ELOG_CLASSES setting.     |
   | zmedico |                                                              |

   | 10683   | Add a "Interaction with previous installed version" section  |
   | zmedico | to document the upgrade/downgrade phase execution order      |
   |         | change from bug #226505.                                     |

   | 10685   | Add note about bug #226505.                                  |
   | zmedico |                                                              |

   | 10687   | * Document eblank and eqawarn in the ebuild.5 man page. *    |
   | zmedico | Create "Ebuild Helper Functions" section docbook format,     |
   |         | including all the functions documented in the ebuild.5 man   |
   |         | page.                                                        |

   | 10690   | fix typo                                                     |
   | genone  |                                                              |

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