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

[Thomas Moschny]

commit 0fc7843badd4c5245544d9fc67bab1cf72ecfebb
Merge: 9263512 29e13f6
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Mon Jun 25 11:26:47 2012 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	python-py.spec

 .gitignore     |    4 ++++
 python-py.spec |   48 ++++++++++++++++++++++++++++++++++++++----------
 sources        |    2 +-
 3 files changed, 43 insertions(+), 11 deletions(-)
---