[Jython-checkins] jython (merge 2.5 -> default): merge with 2.5

[philip.jenvey]

http://hg.python.org/jython/rev/54ab8647cb83
changeset:   6209:54ab8647cb83
parent:      6207:6de378e5a0a8
parent:      6208:69dfd5ee9d84
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Wed May 11 18:30:38 2011 -0700
summary:
  merge with 2.5

files:



-- 
Repository URL: http://hg.python.org/jython