Merged from trunk 10149:10165

   Merged from trunk 10149:10165

   | 10151   | Fix spelling of _show_unsatisfied_blockers().                |
   | zmedico |                                                              |

   | 10153   | Remove obsolete tuple() usage inside depgraph.display().     |
   | zmedico |                                                              |

   | 10155   | Fix some unwanted interaction between --tree display and     |
   | zmedico | unsatisfied blockers in depgraph.display().                  |

   | 10157   | Fix package counters in depgraph.display() so they're only   |
   | zmedico | incremented for "ordered" display nodes.                     |

   | 10160   | Fix misplaced variable used as parameter to                  |
   | zmedico | _load_favorites().                                           |

   | 10162   | In order to fix --tree display behave normally in --resume   |
   | zmedico | mode, properly add to the digraph all packages matched by    |
   |         | arguments.                                                   |

   | 10165   | Do more validation of resume data from the mtimedb.          |
   | zmedico |                                                              |

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