Merged from trunk 6507:6513

   Merged from trunk 6507:6513

   +------------------------------------------------------------------------+
   | 6508    | Make sure USE=test is properly enabled when the test phase   |
   | zmedico | is forced via the ebuild command. Thanks to Caster for       |
   |         | reporting.                                                   |
   |---------+--------------------------------------------------------------|
   | 6511    | For bug #177763, document that FEATURES=keepwork can         |
   | zmedico | interfere with normal emerge operation.                      |
   |---------+--------------------------------------------------------------|
   | 6512    | fix typo from previous commit                                |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6513    | Make sure USE=test is properly enabled when the test phase   |
   | zmedico | is forced via the ebuild command, even when USE from         |
   |         | ${T}/environment doen't have it.                             |
   +------------------------------------------------------------------------+

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