-
Committer:
Robert Collins
-
Date:
2009-10-01 00:56:56 UTC
-
mfrom:
(4634.52.7 2.0)
-
mto:
(4634.52.8 2.0)
-
mto:
This revision was merged to the branch mainline in
revision
4723.
-
Revision ID:
robertc@robertcollins.net-20091001005656-c4rd6cl5jxt6opvk
Merge 2.0 to fix NEWS conflicts.