-
Committer:
Andrew Bennetts
-
Date:
2010-03-11 04:33:41 UTC
-
mfrom:
(4797.33.4 2.1)
-
mto:
This revision was merged to the branch mainline in
revision
5082.
-
Revision ID:
andrew.bennetts@canonical.com-20100311043341-rzdik83fnactjsxs
Merge lp:bzr/2.1, including fixes for #496813, #526211, #526353.