tree 1995f01bd8828ae9647ad407e40dd8584ca843da
parent cb60dae6a1a7841138421866ea15870f6297cf8b
author Jack Jansen <jack.jansen@cwi.nl> 996845496 +0000
committer Jack Jansen <jack.jansen@cwi.nl> 996845496 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%4022169

Merging appropriate 2.1.1 fixes back into the main trunk.