[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Thu, 5 Jan 2012 13:39:47 +0000 (14:39 +0100)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Thu, 5 Jan 2012 13:39:47 +0000 (14:39 +0100)
commit312e42455b36ff5205bc0062824ecac69ded3965
tree8a64280d9781e9e8d51263aeb1e0fa2b903f9243
parentc566d683868c25b4ade57c8feb7f7e2139dbc9bf
parentd0784c983ae8dd8fb5f684a4b53fc7f061d8f056
[merge]

bzr revid: nicolas.vanhoren@openerp.com-20120105133947-hjde1btpo630n9kr