Merged from trunk 7429:7516

   Merged from trunk 7429:7516

   +------------------------------------------------------------------------+
   | 7430    | For bug #137483, move the `emerge --help config` docs to the |
   | zmedico | emerge man page. Thanks to Arfrever Frehtes Taifersar        |
   |         | Arahesis for this patch.                                     |
   |---------+--------------------------------------------------------------|
   | 7432    | For bug #139670, update the dohtml docs to show all          |
   | zmedico | supported file extensions. Thanks to Arfrever Frehtes        |
   |         | Taifersar Arahesis for this patch.                           |
   |---------+--------------------------------------------------------------|
   | 7496    | Always pass a dbapi instance into a setcpv call.             |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7516    | For bug #186960, try to create a directory for $ROOT if it   |
   | zmedico | doesn't exist.                                               |
   +------------------------------------------------------------------------+

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