-
Committer:
Jonathan Lange
-
Date:
2007-04-22 23:00:56 UTC
-
mfrom:
(2440 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
2446.
-
Revision ID:
jml@canonical.com-20070422230056-mfu7bo3ydrbbag7p
Merge bzr.dev, resolving conflicts in error code.