From: Jesse Noller <jnoller@gmail.com>
Date: Tue, 31 Mar 2009 03:35:12 +0000 (+0000)
Subject: merge 70792 to 26 maint
X-Git-Tag: v2.6.2c1~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61e9b35e910c57ebf1c3f30f5de05ff7fa327dab;p=thirdparty%2FPython%2Fcpython.git

merge 70792 to 26 maint
---

diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py
index bfb5f09e11e9..fa8a13a8c7ce 100644
--- a/Lib/multiprocessing/queues.py
+++ b/Lib/multiprocessing/queues.py
@@ -6,7 +6,7 @@
 # Copyright (c) 2006-2008, R Oudkerk --- see COPYING.txt
 #
 
-__all__ = ['Queue', 'SimpleQueue']
+__all__ = ['Queue', 'SimpleQueue', 'JoinableQueue']
 
 import sys
 import os