-
Committer:
Andrew Bennetts
-
Date:
2010-07-14 07:49:45 UTC
-
mfrom:
(4634.151.7 2.0)
-
mto:
(4797.58.6 2.1)
-
mto:
This revision was merged to the branch mainline in
revision
5365.
-
Revision ID:
andrew.bennetts@canonical.com-20100714074945-iwboup7tcsg5drh0
Merge lp:bzr/2.0, including fix for #494211.