merge 70792 to py3k

diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py
index dce3aa63877af3337c04c345cc6f0cae382901d7..a3393d4585419539ad48dd8ac52d0ccd4142d5cd 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