[issue2390] Merge 2.6 ACKS with 3.0 ACKS

[Benjamin Peterson]

Changes by Benjamin Peterson <musiccomposition at gmail.com>:


Removed file: http://bugs.python.org/file9856/unnamed

__________________________________
Tracker <report at bugs.python.org>
<http://bugs.python.org/issue2390>
__________________________________