Re: [Python-Dev] cpython (merge 2.6 -> 2.7): merge with 2.6