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

[frank.wierzbicki]

http://hg.python.org/jython/rev/8b61a77d6dd0
changeset:   6789:8b61a77d6dd0
parent:      6787:cdf3485e1ba6
parent:      6788:8b94cb17bf20
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Mon Jul 09 08:34:02 2012 -0700
summary:
  Merge with 2.5.

files:



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