Merged from trunk -r13350:13355

   Merged from trunk -r13350:13355

   | 13351   | Fix typo from previous commit.                               |
   | zmedico |                                                              |

   | 13352   | Add support for repos.conf 'aliases' attribute which allows  |
   | zmedico | alias substitution in metadata/layout.conf repository        |
   |         | references.                                                  |

   | 13353   | Bug #266493 - Never return a long from vercmp() since that   |
   | zmedico | can trigger an OverflowError if it's returned by a __cmp__   |
   |         | implementation. Thanks to Douglas Anderson <dja@gendja.com>  |
   |         | for the initial patch. I've modified it to use the (a > b) - |
   |         | (a < b) construct as suggested in the py3k docs, since cmp() |
   |         | is no longer supported in py3k.                              |

   | 13354   | Simplify pkgcmp(). Thanks to Douglas Anderson                |
   | zmedico | <dja@gendja.com> for this patch from bug #266493.            |

   | 13355   | Fix lockfile() docstring to correctly document the           |
   | zmedico | wantnewlockfile behavior. Thanks to Arfrever for reporting.  |

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