-
Committer:
Vincent Ladeuil
-
Date:
2010-07-13 16:10:20 UTC
-
mfrom:
(4797.58.5 2.1)
-
mto:
(5050.3.6 2.2)
-
mto:
This revision was merged to the branch mainline in
revision
5345.
-
Revision ID:
v.ladeuil+lp@free.fr-20100713161020-qak83bylrtq5d1gj
Merge 2.1 into 2.2 including fixes for bug #525571 and bug #494221