Merged from trunk -r14396:14402

   Merged from trunk -r14396:14402

   | 14397   | Fix test case for recent changes.                            |
   | zmedico |                                                              |

   | 14398   | Misc performance enhancements. Thanks to Marat Radchenko     |
   | zmedico | <marat@slonopotamus.org> for this patch from bug #276813.    |

   | 14399   | Decode directory names where appropriate in digestcheck().   |
   | zmedico | Thanks to Arfrever for reporting.                            |

   | 14400   | Avoid unicode errors in python 3. Thanks to Arfrever for     |
   | zmedico | reporting.                                                   |

   | 14401   | Warn if cpv_getkey() is given invalid input that triggers    |
   | zmedico | legacy code.                                                 |

   | 14402   | Fix previous commit.                                         |
   | zmedico |                                                              |

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