Merge from vendor branch TNF:
authordrochner <drochner>
Thu, 14 Apr 2011 17:27:04 +0000 (17:27 +0000)
committerdrochner <drochner>
Thu, 14 Apr 2011 17:27:04 +0000 (17:27 +0000)
commit70fc7a9988cd3f5a9fc30e87f31d5178760512f9
treedb5f95dde5620f4e95a81c76568e70c44ef63aa8
parentd2d9bbd19a903bb823c581d4f2474d5a9e2f6325
parent1fcb1f46126a1ff6070428de8cd609403f2bb95b
Merge from vendor branch TNF:
add py-keyring-0.5.1, from Kamel Derouiche per pkgsrc-wip