- 
Committer:
Robert Collins
- 
Date:
2008-09-02 05:28:37 UTC
- 
mfrom:
(3675 +trunk)
- 
mto:
This revision was merged to the branch mainline in
revision
3677.
- 
Revision ID:
robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.