[python-py/f13/master: 2/2] Merge branch 'master' into f13

[Thomas Moschny]

commit 53aad8f91eb8a4e049da5d4a3fcf51b13fa33964
Merge: dc9f8bd 81c37d5
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Sep 18 13:38:55 2010 +0200

    Merge branch 'master' into f13

 .gitignore     |    1 +
 python-py.spec |    9 ++++++---
 sources        |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---