-
Committer:
Mark Sapiro
-
Date:
2008-12-03 01:11:33 UTC
-
mfrom:
(984.1.160 2.1)
-
mto:
(1006.1.48 2.2)
-
mto:
This revision was merged to the branch mainline in
revision
1008.
-
Revision ID:
mark@msapiro.net-20081203011133-4rrgvnkjtkv3qjlg
Merged Python 2.6 and other changes from the 2.1 branch.