-
Committer:
John Arbash Meinel
-
Date:
2006-06-16 21:05:03 UTC
-
mfrom:
(1784 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
1785.
-
Revision ID:
john@arbash-meinel.com-20060616210503-3d6f8d1e9a6ca5b4
[merge] bzr.dev 1784, fix NEWS conflict.