[Merge] with latest addons-trunk rev 6777
authorAlexis de Lattre <alexis@via.ecp.fr>
Mon, 7 May 2012 18:13:46 +0000 (20:13 +0200)
committersebastien beau <sebastien.beau@akretion.com.br>
Mon, 7 May 2012 18:13:46 +0000 (20:13 +0200)
commitb4e8944314e696506ef0d39e6beed72e1b9ecbd4
tree0eae35a1800e957e68cfe7a582021c888333fabc
parentfeea6393a94fb6ed73f19c450e5db004f21aae26
[Merge] with latest addons-trunk rev 6777

bzr revid: alexis@via.ecp.fr-20120507181346-6jvgc0u5gi6pnm1w