Merge 3.3.

Lib/multiprocessing/popen_fork.py

@@ -47,7 +47,7 @@ class Popen(object):
     def wait(self, timeout=None):
         if self.returncode is None:
             if timeout is not None:
-                from .connection import wait
+                from multiprocessing.connection import wait
                 if not wait([self.sentinel], timeout):
                     return None
             # This shouldn't block if wait() returned successfully.