-
Committer:
Abel Deuring
-
Date:
2009-06-12 16:36:02 UTC
-
mfrom:
(8610 launchpad)
-
mto:
This revision was merged to the branch mainline in
revision
8613.
-
Revision ID:
abel.deuring@canonical.com-20090612163602-lz5zk5qep4qhqwjk
RF merge; conflict resolved