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

[Pádraig Brady]

commit e71f41e389071f339a52ab13f7f1be656ebb4306
Merge: e9af27f f722c10
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Aug 3 01:12:52 2012 +0100

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

 .gitignore             |    1 +
 dummythread_leak.patch |  359 ------------------------------------------------
 python-eventlet.spec   |   16 +--
 sources                |    2 +-
 4 files changed, 8 insertions(+), 370 deletions(-)
---
diff --cc python-eventlet.spec
index 43c4195,33cf2ae..92f8ca0
--- a/python-eventlet.spec
+++ b/python-eventlet.spec
@@@ -78,11 -76,22 +71,14 @@@ rm -rf %{buildroot
  %files doc
  %defattr(-,root,root,-)
  %doc doc/_build/html examples tests
 -%endif
  
  %changelog
+ * Fri Aug 03 2012 Pádraig Brady <P at draigBrady.com - 0.9.17-1
+ - Update to 0.9.17
+ 
 -* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.16-7
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -
 -* Tue Mar 27 2012 Pádraig Brady <P at draigBrady.com - 0.9.16-6
 +* Tue Mar 27 2012 Pádraig Brady <P at draigBrady.com - 0.9.16-5
  - Update patch to avoid leak of _DummyThread objects
  
 -* Mon Mar  5 2012 Pádraig Brady <P at draigBrady.com - 0.9.16-5
 -- Fix patch to avoid leak of _DummyThread objects
 -
  * Wed Feb 29 2012 Pádraig Brady <P at draigBrady.com - 0.9.16-4
  - Apply a patch to avoid leak of _DummyThread objects