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

[Pádraig Brady]

commit cccd39a5fdb51080bc4e14c04c96e209f98df2fa
Merge: c97462e e7db6dc
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Nov 9 15:28:29 2011 +0000

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

 python-eventlet.spec     |   12 +++++++++++-
 subprocess_timeout.patch |   14 ++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --cc python-eventlet.spec
index bda543a,253a3e4..dd922cf
--- a/python-eventlet.spec
+++ b/python-eventlet.spec
@@@ -4,7 -4,7 +4,7 @@@
  
  Name:           python-eventlet
  Version:        0.9.16
--Release:        2%{?dist}
++Release:        3%{?dist}
  Summary:        Highly concurrent networking library
  Group:          Development/Libraries
  License:        MIT
@@@ -65,11 -76,14 +71,15 @@@ rm -rf %{buildroot
  %files doc
  %defattr(-,root,root,-)
  %doc doc/_build/html examples tests
 -%endif
  
  %changelog
 -* Wed Nov 09 2011 Pádraig Brady <P at draigBrady.com - 0.9.16-2
++* Wed Nov 09 2011 Pádraig Brady <P at draigBrady.com - 0.9.16-3
+ - Apply a patch to support subprocess.Popen implementations
+   that accept the timeout parameter, which is the case on RHEL >= 6.1
+ 
 +* Fri Oct 21 2011 Pádraig Brady <P at draigBrady.com> - 0.9.16-2
 +- Changed python-sphinx build dependency to python-sphinx10
 +
  * Sat Aug 27 2011 Kevin Fenzi <kevin at scrye.com> - 0.9.16-1
  - Update to 0.9.16