-
Committer:
Andrew Bennetts
-
Date:
2008-11-27 09:00:45 UTC
-
mfrom:
(3865 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
3866.
-
Revision ID:
andrew.bennetts@canonical.com-20081127090045-qxatg46jzwrbh2lg
Merge bzr.dev, resolving NEWS conflict. (And improve the wording of the new NEWS entry too.)