merge 3.2

This commit is contained in:
Benjamin Peterson 2011-03-16 10:29:37 -05:00
commit 09bb8f46aa

View file

@ -73,7 +73,7 @@ Library
------- -------
- Issue #11133: fix two cases where inspect.getattr_static can trigger code - Issue #11133: fix two cases where inspect.getattr_static can trigger code
execution. Patch by Daniel Urban. execution. Patch by Andreas Stührk.
- Issue #11569: use absolute path to the sysctl command in multiprocessing to - Issue #11569: use absolute path to the sysctl command in multiprocessing to
ensure that it will be found regardless of the shell PATH. This ensures ensure that it will be found regardless of the shell PATH. This ensures