[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)
bzr revid: vta@openerp.com-20130108104008-4jg3spjkxhmb82d7


Trivial merge