- 
Committer:
Martin Pool
- 
Date:
2006-02-01 12:24:35 UTC
- 
mfrom:
(1534.4.32 branch-formats)
- 
mto:
This revision was merged to the branch mainline in
revision
1553.
- 
Revision ID:
mbp@sourcefrog.net-20060201122435-53f3efb1b5749fe1
[merge] branch-formats branch, and reconcile changes