[MERGE] Latest trunk.
authorvta vta@openerp.com <>
Fri, 2 Nov 2012 13:20:10 +0000 (14:20 +0100)
committervta vta@openerp.com <>
Fri, 2 Nov 2012 13:20:10 +0000 (14:20 +0100)
bzr revid: vta@openerp.com-20121102132010-5kfh8p8519dp61pn


Trivial merge