]> granicus.if.org Git - python/commitdiff
merge
authorMark Dickinson <mdickinson@enthought.com>
Sat, 25 Jun 2011 10:02:53 +0000 (12:02 +0200)
committerMark Dickinson <mdickinson@enthought.com>
Sat, 25 Jun 2011 10:02:53 +0000 (12:02 +0200)

Trivial merge