[MERGE] Latest trunk
authorvta vta@openerp.com <>
Wed, 2 Jan 2013 10:24:15 +0000 (11:24 +0100)
committervta vta@openerp.com <>
Wed, 2 Jan 2013 10:24:15 +0000 (11:24 +0100)
bzr revid: vta@openerp.com-20130102102415-y104nqzm5dz1is3n


Trivial merge