From ff18a2e01c78c98211c692848d733c6222aa682f Mon Sep 17 00:00:00 2001
From: Ryan Williams <rdw@lindenlab.com>
Date: Fri, 26 Feb 2010 16:47:22 -0800
Subject: [PATCH 1/3] 0.9.6 branding

---
 AUTHORS              | 1 +
 doc/real_index.html  | 2 +-
 eventlet/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 1b6d574..f921e4e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Contributors
 * Patrick Carlisle
 * Brantley Harris
 * Gregory Holt
+* Joe Malicki
 * Chet Murthy
 * Eugene Oden
 * radix
diff --git a/doc/real_index.html b/doc/real_index.html
index 3be82f5..fad3ad0 100644
--- a/doc/real_index.html
+++ b/doc/real_index.html
@@ -41,7 +41,7 @@ easy_install eventlet
 
 <p>Alternately, you can download the source tarball:
 <ul>
-<li><a href="http://pypi.python.org/packages/source/e/eventlet/eventlet-0.9.5.tar.gz">eventlet-0.9.5.tar.gz</a></li>
+<li><a href="http://pypi.python.org/packages/source/e/eventlet/eventlet-0.9.6.tar.gz">eventlet-0.9.6.tar.gz</a></li>
 </ul>
 </p>
 
diff --git a/eventlet/__init__.py b/eventlet/__init__.py
index e82a15a..b70405e 100644
--- a/eventlet/__init__.py
+++ b/eventlet/__init__.py
@@ -1,4 +1,4 @@
-version_info = (0, 9, 6, "dev1")
+version_info = (0, 9, 6)
 __version__ = ".".join(map(str, version_info))
 
 try:

From cac3d24f2fdc47d96829a4d9a86b999e2cc968b3 Mon Sep 17 00:00:00 2001
From: Ryan Williams <rdw@lindenlab.com>
Date: Sat, 27 Feb 2010 17:59:50 -0800
Subject: [PATCH 3/3] Conditional import of attributes.

---
 eventlet/green/socket.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/eventlet/green/socket.py b/eventlet/green/socket.py
index aeadc0d..eaba5ba 100644
--- a/eventlet/green/socket.py
+++ b/eventlet/green/socket.py
@@ -14,14 +14,20 @@ import warnings
 __patched__ = ['fromfd', 'socketpair', 'gethostbyname', 'create_connection',
                'ssl', 'socket']
 
-__original_fromfd__ = __socket.fromfd
-def fromfd(*args):
-    return socket(__original_fromfd__(*args))
+try:
+    __original_fromfd__ = __socket.fromfd
+    def fromfd(*args):
+        return socket(__original_fromfd__(*args))
+except AttributeError:
+    pass
 
-__original_socketpair__ = __socket.socketpair
-def socketpair(*args):
-    one, two = __original_socketpair__(*args)
-    return socket(one), socket(two)
+try:
+    __original_socketpair__ = __socket.socketpair
+    def socketpair(*args):
+        one, two = __original_socketpair__(*args)
+        return socket(one), socket(two)
+except AttributeError:
+    pass
 
 __original_gethostbyname__ = __socket.gethostbyname
 def gethostbyname(name):