[Merge] with latest addons-trunk rev 6777
bzr revid: alexis@via.ecp.fr-20120507181346-6jvgc0u5gi6pnm1w
This commit is contained in:
committed by
sebastien beau
parent
feea6393a9
commit
b4e8944314