-
Committer:
Andrew Bennetts
-
Date:
2010-09-17 04:35:23 UTC
-
mfrom:
(5050.17.20 2.2)
-
mto:
This revision was merged to the branch mainline in
revision
5431.
-
Revision ID:
andrew.bennetts@canonical.com-20100917043523-c5t63gmvxqxmqh5j
Merge lp:bzr/2.2, including fixes for #625574, #636930, #254278.