merge

diff --cc Lib/subprocess.py
index e4bb78e87991e0d6eff72208636961e39910a1f2,9856e6a3330684d290f7de2d40742e0fc1b50359..ad362231304fb1a4642d6a07a9ba366b0da96ecd
--- 1/Lib/subprocess.py
--- 2/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@@ -432,11 -412,18 +432,18 @@@ else
              return fds
  
  __all__ = ["Popen", "PIPE", "STDOUT", "call", "check_call", "getstatusoutput",
 -           "getoutput", "check_output", "CalledProcessError"]
 +           "getoutput", "check_output", "CalledProcessError", "DEVNULL"]
  
  if mswindows:
-     from _subprocess import CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP
-     __all__.extend(["CREATE_NEW_CONSOLE", "CREATE_NEW_PROCESS_GROUP"])
+     from _subprocess import (CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP,
+                              STD_INPUT_HANDLE, STD_OUTPUT_HANDLE,
+                              STD_ERROR_HANDLE, SW_HIDE,
+                              STARTF_USESTDHANDLES, STARTF_USESHOWWINDOW)
+                 
+     __all__.extend(["CREATE_NEW_CONSOLE", "CREATE_NEW_PROCESS_GROUP",
+                     "STD_INPUT_HANDLE", "STD_OUTPUT_HANDLE",
+                     "STD_ERROR_HANDLE", "SW_HIDE",
+                     "STARTF_USESTDHANDLES", "STARTF_USESHOWWINDOW"])
  try:
      MAXFD = os.sysconf("SC_OPEN_MAX")
  except: