-
Committer:
Vincent Ladeuil
-
Date:
2011-08-16 15:12:39 UTC
-
mfrom:
(6072 +trunk)
-
mto:
This revision was merged to the branch mainline in
revision
6075.
-
Revision ID:
v.ladeuil+lp@free.fr-20110816151239-dtxlk1q0qjhohbt2
Merge into trunk resolving conflicts