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

[Ralph Bean]

commit f1b4434d0729c902a90771ef98e4017208883a27
Merge: 4910e82 6c53c9c
Author: Ralph Bean <rbean at redhat.com>
Date:   Tue May 29 22:57:22 2012 -0400

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

 python-txws.spec |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --cc python-txws.spec
index d3328c7,b84cceb..9c40f2b
--- a/python-txws.spec
+++ b/python-txws.spec
@@@ -24,8 -24,11 +24,9 @@@ for adding WebSockets server support t
  
  %prep
  %setup -q -n txWS-%{version}
+ 
 -# Patch out the setuptools requirement on Twisted since epel doesn't ship
 -# twisted egg-info
 -%if %{?rhel}%{!?rhel:0} >= 6
 -%{__sed} -i 's/"Twisted",//' setup.py
 +%if 0%{?rhel}
 +%{__sed} -i -e 's/"Twisted",//' setup.py
  %endif
  
  %build