[MERGE] Latest trunk
authorvta vta@openerp.com <>
Tue, 8 Jan 2013 10:40:08 +0000 (11:40 +0100)
committervta vta@openerp.com <>
Tue, 8 Jan 2013 10:40:08 +0000 (11:40 +0100)
commit6d5a9a718586a87cf11744d0a19efcb6f9451c82
treeb43e21d8361d4c1a80a2b3c4dd086f6d7ea3f65c
parentcd1454e6b928b2bb9475b7c4ab64472d1a150cd6
parent0f8f8076622450accc7e83219d448a94a49cd4eb
[MERGE] Latest trunk

bzr revid: vta@openerp.com-20130108104008-4jg3spjkxhmb82d7