-
Committer:
John Arbash Meinel
-
Date:
2007-10-30 20:36:16 UTC
-
mfrom:
(322.1.1 trunk)
-
mto:
(330.3.3 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
368.
-
Revision ID:
john@arbash-meinel.com-20071030203616-op14zvvmflw6ds1n
Merge in Jelmer's trunk update + conflict resolution.