[python/f19: 10/10] Merge branch 'master' into f19

[Bohuslav Kabrda]

commit 7d2a68252b21bbf51849cf4617ccde698d31a689
Merge: 1526d92 dfec9da
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Mon Jul 8 11:38:19 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	python.spec

 ...should-build-with-libffi-multilib-wrapper.patch |   12 ++++++++
 python.spec                                        |   30 +++++++++++++++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---