-
Committer:
Jonathan Lange
-
Date:
2011-02-04 17:21:05 UTC
-
mfrom:
(12324 launchpad)
-
mto:
This revision was merged to the branch mainline in
revision
12333.
-
Revision ID:
jml@canonical.com-20110204172105-iwf2vbr6st29eea7
Merge stable, resolving conflicts.