Merged from trunk 6516:6519

   Merged from trunk 6516:6519

   +------------------------------------------------------------------------+
   | 6517    | Make sure FEATURES=test and USE=test are consistently        |
   | zmedico | enabled for all requested phases when the test phase is      |
   |         | forced via the ebuild command.                               |
   |---------+--------------------------------------------------------------|
   | 6519    | For bug #177763, clarify about how FEATURES=keepwork allows  |
   | zmedico | ${WORKDDIR} to be reused.                                    |
   +------------------------------------------------------------------------+

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