-
Committer:
Olivier Tilloy
-
Date:
2011-02-07 17:21:35 UTC
-
mfrom:
(359.2.33 maverick)
-
mto:
(359.2.43 maverick)
-
mto:
This revision was merged to the branch mainline in
revision
384.
-
Revision ID:
olivier.tilloy@canonical.com-20110207172135-qk79mrsxfwqkx2ek
Merge the latest changes from the trunk, resolving conflicts in launcher/app/launcher.cpp.