Merged from trunk 7137:7161

   Merged from trunk 7137:7161

   +------------------------------------------------------------------------+
   | 7138    | In depgraph.select_files(), unify favorites handling with    |
   | zmedico | the other args handling.                                     |
   |---------+--------------------------------------------------------------|
   | 7139    | Fix --oneshot handling from the previous commit.             |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7140    | Use depgraph._args_nodes to simplify                         |
   | zmedico | depgraph.saveNomergeFavorites().                             |
   |---------+--------------------------------------------------------------|
   | 7142    | Record a slot atom in the world file for any atom that is    |
   | zmedico | precise enough to identify a specific slot. Make depclean    |
   |         | clean unnecessary slots of system and world packages. For    |
   |         | update and depclean, world atoms can be greedy with slots    |
   |         | while system atoms can not.                                  |
   |---------+--------------------------------------------------------------|
   | 7144    | Fix greedy atoms logic for system mode.                      |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7146    | For bug #183861, allow a color class in color.map to specify |
   | zmedico | a space separated list of attributes so that any combination |
   |         | of foreground, background, and other attributes is possible. |
   |         | Thanks to Arfrever Frehtes Taifersar Arahesis                |
   |         | <Arfrever.FTA@GMail.Com> for this patch.                     |
   |---------+--------------------------------------------------------------|
   | 7147    | Add a "onerror" callback to parse_color_map() for handling   |
   | zmedico | each ParseError that would otherwise be raised.              |
   |---------+--------------------------------------------------------------|
   | 7148    | Fix broken code concatenation logic in parse_color_map().    |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7149    | Make the color class handling for package sets more          |
   | zmedico | consistent as suggested in comment #2 of bug #183861.        |
   |---------+--------------------------------------------------------------|
   | 7150    | Document the additional color classes for bug #183861.       |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 7153    | Replace sys.exit() with return in depgraph.display() and     |
   | zmedico | action_build().                                              |
   |---------+--------------------------------------------------------------|
   | 7155    | Add note about repo name warnings                            |
   | genone  |                                                              |
   |---------+--------------------------------------------------------------|
   | 7157    | Remove fallback imports for set(), and note minimum          |
   | genone  | requirement of python-2.4                                    |
   |---------+--------------------------------------------------------------|
   | 7159    | Remove redundant config update notification (bug #184116)    |
   | genone  |                                                              |
   |---------+--------------------------------------------------------------|
   | 7161    | Move depgraph._args_atoms to depgraph._sets["args"] and move |
   | zmedico | depgraph._args_nodes to self._set_nodes.                     |
   +------------------------------------------------------------------------+

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