[python-txws/el6: 2/2] Merge branch 'master' into el6

[Ralph Bean]

commit 1abbabef0e5d5c706264dab085bb86f92d2877f5
Merge: f1b4434 ff78588
Author: Ralph Bean <rbean at redhat.com>
Date:   Tue May 29 23:15:17 2012 -0400

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

 python-txws.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---