[MERGE] Latest trunk
authorvta vta@openerp.com <>
Wed, 26 Dec 2012 18:20:41 +0000 (19:20 +0100)
committervta vta@openerp.com <>
Wed, 26 Dec 2012 18:20:41 +0000 (19:20 +0100)
commitf9ac8402e5377dc3140016416dca59bd2beb03f5
treeb3903f885e5f6580e65f17cd81939f81402ac36d
parentefa8d0e2988646970d08a839bcc1ad92b9226e0a
parent75272a50590bb37f51a80ee550a1d5afe3aa9bfa
[MERGE] Latest trunk

bzr revid: vta@openerp.com-20121226182041-q05byjif0e3ghz9w