]> granicus.if.org Git - python/commitdiff
#16886: merge with 3.3
authorFrank Wierzbicki <fwierzbicki@gmail.com>
Wed, 16 Jan 2013 21:58:14 +0000 (13:58 -0800)
committerFrank Wierzbicki <fwierzbicki@gmail.com>
Wed, 16 Jan 2013 21:58:14 +0000 (13:58 -0800)

Trivial merge