-
Committer:
Andrew Bennetts
-
Date:
2010-08-16 03:43:35 UTC
-
mfrom:
(4797.58.8 2.1)
-
mto:
(5050.17.9 2.2)
-
mto:
This revision was merged to the branch mainline in
revision
5379.
-
Revision ID:
andrew.bennetts@canonical.com-20100816034335-xn6j97hwdw2b638m
Merge lp:bzr/2.1, including fix for #192859.