[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Fri, 9 Nov 2012 08:39:25 +0000 (09:39 +0100)
committerChristophe Matthieu <chm@openerp.com>
Fri, 9 Nov 2012 08:39:25 +0000 (09:39 +0100)
commit65b8b46401c0cb3803355d9121a3333bbabe0071
tree5a059dd97435db819cc9548d705b3abd4d534ffe
parent0baf4727ef105ece65f686180ed31e0881c952e3
parentd3b22ccb36c727afcdfbcda2877f81338a97a753
[MERGE] from trunk

bzr revid: chm@openerp.com-20121109083925-rpuk4rwyu3kx50vt