Merged from trunk -r14131:14140

   Merged from trunk -r14131:14140

   | 14132   | Add a LIVEVCS.unmasked category for ebuilds that have        |
   | zmedico | non-empty KEYWORDS and are not masked in the global          |
   |         | package.mask. Thanks to Diego E. Pettenò for the            |
   |         | suggestion.                                                  |

   | 14133   | Bug #282306 - Inside dblink._match_contents(), fall back to  |
   | zmedico | utf_8 encoding if a path cannot be encoded under the user's  |
   |         | chosen encoding. This should fix the traceback shown in bug  |
   |         | #281199, comment #26.                                        |

   | 14134   | Bug #282505 - Fix unicode handling for package moves in      |
   | zmedico | binary packages.                                             |

   | 14140   | remove FIXME, since zmedico fixed it                         |
   | grobian |                                                              |

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