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

[philip.jenvey]

http://hg.python.org/jython/rev/fa7102ff8ba9
changeset:   6202:fa7102ff8ba9
parent:      6199:f77a4bf6b24d
parent:      6201:6addc109c69c
user:        Philip Jenvey <pjenvey at underboss.org>
date:        Sat May 07 14:54:10 2011 -0700
summary:
  merge with 2.5

files:



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