[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 10 Jul 2012 13:29:36 +0000 (15:29 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 10 Jul 2012 13:29:36 +0000 (15:29 +0200)
commitcc98560cfdab6308ed5db87b266cdbb6b9ff4f74
tree4808aca4f2fcae60bf85b91ffa93bd9df992ac34
parent7fcb86cbd76666c1f5c9162850b0dddfc17e8dd0
parentd572f1b271f133656929804d532c7d281ab3e902
[MERGE] from trunk

bzr revid: fva@openerp.com-20120710132936-izz782r9dhu6mgln