-
Committer:
Martin Albisetti
-
Date:
2009-05-28 08:17:40 UTC
-
mfrom:
(356 trunk)
-
mto:
(352.6.11 serve-config)
-
mto:
This revision was merged to the branch mainline in
revision
364.
-
Revision ID:
martin.albisetti@canonical.com-20090528081740-t9wx5c7fz7s121ge
Merge from trunk and fix conflict by refactoring the code