tree f7b1e40f24563a9800d31b517cac615c991b0d09
parent 69b83b113f9e6fed321288ea23bca2aa673a7beb
author Jack Jansen <jack.jansen@cwi.nl> 1007129796 +0000
committer Jack Jansen <jack.jansen@cwi.nl> 1007129796 +0000
HG:extra convert_revision:svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/python/branches/legacy-trunk%4024426

Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).