[MERGE] from stw
authorFrédéric van der Essen <fva@openerp.com>
Thu, 28 Jun 2012 12:39:12 +0000 (14:39 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 28 Jun 2012 12:39:12 +0000 (14:39 +0200)
commitc753d215dd66a777bb867c96f81a0be6e1d2998f
tree2b681ce4c538c06c8ac26f9fa4edea64eb224db8
parentf69643a4a1221f291c300c0ce0db49fbe576b68b
parentda5d0d890c098b6c02e26317bf1cfcbe55452489
[MERGE] from stw

bzr revid: fva@openerp.com-20120628123912-pn1rzfji2xt7lv76