-
Committer:
j.c.sackett
-
Date:
2011-07-22 15:13:54 UTC
-
mto:
This revision was merged to the branch mainline in
revision
13509.
-
Revision ID:
jonathan.sackett@canonical.com-20110722151354-7fdo2jepj8l7ji8y
Fixed bad conflict resolution leading to the need for rollback.