[MERGE]
authorvta vta@openerp.com <>
Wed, 26 Dec 2012 18:28:06 +0000 (19:28 +0100)
committervta vta@openerp.com <>
Wed, 26 Dec 2012 18:28:06 +0000 (19:28 +0100)
commite6c951dd47db6f35dac18e99ad7e9cae361cc34e
treeb3903f885e5f6580e65f17cd81939f81402ac36d
parent75272a50590bb37f51a80ee550a1d5afe3aa9bfa
parentf9ac8402e5377dc3140016416dca59bd2beb03f5
[MERGE]

bzr revid: vta@openerp.com-20121226182806-i1d9sasgshx56d71