]> granicus.if.org Git - python/commitdiff
Merged upstream.
authorAlex Gaynor <alex.gaynor@gmail.com>
Sun, 17 Jul 2011 23:22:05 +0000 (16:22 -0700)
committerAlex Gaynor <alex.gaynor@gmail.com>
Sun, 17 Jul 2011 23:22:05 +0000 (16:22 -0700)

Trivial merge