[MERGE] Latest trunk.
authorvta vta@openerp.com <>
Mon, 30 Jul 2012 09:13:07 +0000 (11:13 +0200)
committervta vta@openerp.com <>
Mon, 30 Jul 2012 09:13:07 +0000 (11:13 +0200)
commit30fb0902685d700dea875a901036b91b2142fca1
tree4c4c7a9b9f3d84cedd152fbb0c146074b0f31912
parentf920e391e05fa1334d45d9ef5e3e28957cb27952
[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20120730091307-9voufmj0p09bndqr