-
Committer:
Vincent Ladeuil
-
Date:
2007-07-04 12:28:56 UTC
-
mfrom:
(2584 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
2646.
-
Revision ID:
v.ladeuil+lp@free.fr-20070704122856-7jn5e6ou08ukimof
merge bzr.dev @ 2584 resolving conflicts