-
Committer:
Martin Pool
-
Date:
2008-09-17 07:18:20 UTC
-
mfrom:
(3697.2.6 261315-into-1.7)
-
mto:
This revision was merged to the branch mainline in
revision
3710.
-
Revision ID:
mbp@sourcefrog.net-20080917071820-3k1cp4qgyu55dguz
Merge 1.7 branch including fix for #269214 and #261315 back to trunk