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

[Thomas Moschny]

commit dc9f8bd5ef4dba5a78550d9b6aff8d81f2faaff1
Merge: f5f866f d1e3feb
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Fri Aug 27 13:13:55 2010 +0200

    Merge branch 'master' into f13

 python-py.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---