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

[philip.jenvey]

http://hg.python.org/jython/rev/1651fbbecffd
changeset:   6265:1651fbbecffd
parent:      6261:179cb4437158
parent:      6264:0ba48ac4ed54
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Tue Nov 01 16:15:59 2011 -0700
summary:
  merge with 2.5

files:



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