-
Committer:
Vincent Ladeuil
-
Date:
2011-07-07 10:19:00 UTC
-
mfrom:
(6011.2.1 trunk)
-
mto:
(6012.1.1 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6013.
-
Revision ID:
v.ladeuil+lp@free.fr-20110707101900-b0mxc2cnwu2dql97
Merging in trunk with root-id preserved