[MERGE] lp: 751472
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 20 Apr 2011 13:45:16 +0000 (15:45 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 20 Apr 2011 13:45:16 +0000 (15:45 +0200)
commit5a058fe0e289f9231c4ddc52c6f0635c03ee738a
treec9baf687c4545f675fe813df7655c555022a4914
parentd2214c194a3ff822704a62ee14a776dbe09d5b5c
parent0195b0755c09c9c898dcbd94a35897f594eac85e
[MERGE] lp: 751472

bzr revid: qdp-launchpad@openerp.com-20110420134516-34v7aqfq0rejo6e6