-
Committer:
Vincent Ladeuil
-
Date:
2008-05-09 06:46:17 UTC
-
mfrom:
(3418 +trunk)
-
mto:
(3426.1.1 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
3427.
-
Revision ID:
v.ladeuil+lp@free.fr-20080509064617-pgpuhoy5wbcfda2i
merge bzr.dev, fixing simple conflicts