Merged from trunk -r14317:14326

   Merged from trunk -r14317:14326

   | 14318    | Add deprecation warnings to vartree.exists_specific_cat(),  |
   | zmedico  | getnode(), and hasnode(). Use dbapi methods instead.        |

   | 14319    | Make key_expand() always return Atom type.                  |
   | zmedico  |                                                             |

   | 14320    | Use dep_expand instead of key_expand in the blocker         |
   | zmedico  | display, since it seems like a better fit. Also, use        |
   |          | str(atom) since we don't want to assume that Atoms are      |
   |          | string type (though they happen to be now). This assumption |
   |          | is what caused the traceback in bug 285637, comment #5.     |

   | 14321    | Support both Python 2 and 3 in portage._unicode_encode()    |
   | arfrever | and portage._unicode_decode(). Update decoding in some      |
   |          | files.                                                      |

   | 14322    | Deprecate key_expand and                                    |
   | zmedico  | portage.dbapi.porttree.portagetree.resolve_specific which   |
   |          | calls it.                                                   |

   | 14323    | Fix breakage in _unicode_encode() for non-string types.     |
   | zmedico  |                                                             |

   | 14324    | Show deprecation warnings when dep_* legacy code is         |
   | zmedico  | triggered.                                                  |

   | 14325    | Simplify match_to_list(). Thanks to Marat Radchenko         |
   | zmedico  | <marat@slonopotamus.org> for this patch from bug #276813.   |

   | 14326    | Fix case for 0 args in args unicode conversion.             |
   | zmedico  |                                                             |

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