-
Committer:
Vincent Ladeuil
-
Date:
2010-11-05 14:07:45 UTC
-
mfrom:
(5050.45.7 2.2)
-
mto:
This revision was merged to the branch mainline in
revision
5524.
-
Revision ID:
v.ladeuil+lp@free.fr-20101105140745-e5xwb9b75a4i7ef1
Merge 2.2 into trunk resolving conflicts and including fix for bug #632465