[python-greenlet/el6: 7/7] Merge branch 'master' into el6

[Pádraig Brady]

commit b6d23366bbbd2bf7cba86bb92104df3b19208c71
Merge: 11bdf82 12bf204
Author: Pádraig Brady <P at draigBrady.com>
Date:   Tue Nov 1 02:37:09 2011 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	python-greenlet.spec

 get-rid-of-ts_origin.patch |  106 ++++++++++++++++++++++++++++++++++++++++++++
 i686-register-fixes.patch  |   62 +++++++++++++++++++++++++
 python-greenlet.spec       |   36 ++++++++++++++-
 3 files changed, 202 insertions(+), 2 deletions(-)
---