-
Committer:
Martin Packman
-
Date:
2011-10-26 16:44:52 UTC
-
mfrom:
(6015.33.13 2.4)
-
mto:
This revision was merged to the branch mainline in
revision
6233.
-
Revision ID:
martin.packman@canonical.com-20111026164452-zv7ebei37ytcizjd
Merge 2.4 to get clean diff for next merge