-
Committer:
Andrew Bennetts
-
Date:
2009-10-28 00:12:03 UTC
-
mfrom:
(4774 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
4775.
-
Revision ID:
andrew.bennetts@canonical.com-20091028001203-m7lgs1wtnilgo3br
Merge lp:bzr, resolving NEWS conflict.