Merged from trunk 6262:6277

   Merged from trunk 6262:6277

   +------------------------------------------------------------------------+
   | 6263     | default --help should be usable, so make the extended       |
   | SpankMan | output require --verbose                                    |
   |----------+-------------------------------------------------------------|
   | 6264     | Add --verbose to the "for more help" message.               |
   | zmedico  |                                                             |
   |----------+-------------------------------------------------------------|
   | 6265     | Ignore non-existent directories for bug #171809. This is    |
   | zmedico  | required for readonly mode.                                 |
   |----------+-------------------------------------------------------------|
   | 6267     | For bug #171840, consider all choices for slot intersection |
   | zmedico  | and promote those that have upgrades relative to other      |
   |          | choices.                                                    |
   |----------+-------------------------------------------------------------|
   | 6269     | Clean up and simplify preference selection logic for bug    |
   | zmedico  | #171840.                                                    |
   |----------+-------------------------------------------------------------|
   | 6271     | For bug #172033, remove the obsolete QA Notice for man      |
   | zmedico  | pages that are already compressed.                          |
   |----------+-------------------------------------------------------------|
   | 6273     | Allow the merge task to continue despite conflicts when     |
   | zmedico  | --fetch-all-uri is specified.                               |
   |----------+-------------------------------------------------------------|
   | 6275     | return from the merge task instead of calling sys.exit      |
   | zmedico  | directly.                                                   |
   |----------+-------------------------------------------------------------|
   | 6277     | Verify all ebuild manifests before building anything now so |
   | zmedico  | that the user is notified of failure as soon as possible.   |
   +------------------------------------------------------------------------+

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