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

[Thomas Moschny]

commit 89b66fd86b894023ee817fbdcd5343b7082a35d4
Merge: 0fc7843 70c9625
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Mon Jun 25 11:54:22 2012 +0200

    Merge branch 'master' into f16

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