[MERGE] lp: 825008
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 12 Aug 2011 09:28:49 +0000 (11:28 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 12 Aug 2011 09:28:49 +0000 (11:28 +0200)
commit37ab95efff4b8922b6f728237eb3392289e1d20f
tree26cb993a9d0b620fb08c9e5154e793a61c9685e6
parent86a5de431bc6c59569cef680fc41ed712caa0f31
parent18de9c065a33e6cb0e32195be0d374ec93a3e763
[MERGE] lp: 825008

bzr revid: qdp-launchpad@openerp.com-20110812092849-7y1h6lesg3execbd