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

[Pádraig Brady]

commit ee3c798c9703677f5676420560a2d46f1512c27b
Merge: e71f41e d5dd03c
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Nov 12 01:01:54 2012 +0000

    Merge branch 'master' into el6

 python-eventlet.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --cc python-eventlet.spec
index 92f8ca0,c629e2c..b14f701
--- a/python-eventlet.spec
+++ b/python-eventlet.spec
@@@ -71,8 -79,13 +74,11 @@@ rm -rf %{buildroot
  %files doc
  %defattr(-,root,root,-)
  %doc doc/_build/html examples tests
 -%endif
  
  %changelog
+ * Mon Nov 12 2012 Pádraig Brady <P at draigBrady.com - 0.9.17-2
+ - fix waitpid() override to not return immediately
+ 
  * Fri Aug 03 2012 Pádraig Brady <P at draigBrady.com - 0.9.17-1
  - Update to 0.9.17