[MERGE] lp:915426
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 18 Jan 2012 12:50:46 +0000 (13:50 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 18 Jan 2012 12:50:46 +0000 (13:50 +0100)
commit7e64d5270ed70e6951789a2b3c58ee47a72b6fa8
treebc21cd7bcbd6285e94d61f7b927250cd93dd67d2
parent110e8262527d47786bef571ecd65e99bab6c3057
parent61f200141499e8476a24039d4de67ba7aeccd6e7
[MERGE] lp:915426

bzr revid: qdp-launchpad@openerp.com-20120118125046-rlre1oheeuwfepwh