merge 70792 to 26 maint

diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py
index bfb5f09e11e9485856f4f159d08fdc4594276c00..fa8a13a8c7ced62ea8c31bb789466b7d4f3a2821 100644 (file)
--- 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