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

[Thomas Moschny]

commit f5f866fec481ff2fd7c822e3d5868b33ddc72311
Merge: a5a75fc f918cca
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Jul 31 18:51:51 2010 +0200

    Merge branch 'master' into f13

 .gitignore     |    7 ++++++-
 python-py.spec |    8 +++++++-
 sources        |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---