merge 3.3 (#20249)
authorBenjamin Peterson <benjamin@python.org>
Sun, 2 Mar 2014 00:14:48 +0000 (19:14 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 2 Mar 2014 00:14:48 +0000 (19:14 -0500)
1  2 
Lib/test/test_posix.py

Simple merge