tree eb03a9c297dcf87743f60375cab93ce57ee9930d
parent cae7f886e31f25fd9255be05322626675713d74f
author Gregory P. Smith <greg@mad-scientist.com> 1220815537 +0000
committer Gregory P. Smith <greg@mad-scientist.com> 1220815537 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/release25-maint%4066299

backport r66295 from trunk (small fix to the previous backport)