[MERGE] lp: 751222
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 29 Dec 2011 16:38:07 +0000 (17:38 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Thu, 29 Dec 2011 16:38:07 +0000 (17:38 +0100)
commit3a2c1833c7580d555cc64d2d5964e21ba8549249
tree356fcbd7f1bc74548680d1d62d9653e861a3f614
parent0483747b450a130c48752af7c1d72596089667d8
parent4969b4e4de1a9c98e389a83b400d10a175be41d5
[MERGE] lp: 751222

bzr revid: qdp-launchpad@openerp.com-20111229163807-3hh4imvilp8v3y65