[MERGE] Latest trunk.
bzr revid: vta@openerp.com-20120730091307-9voufmj0p09bndqr
This commit is contained in:
parent
f920e391e0
commit
30fb090268
bzr revid: vta@openerp.com-20120730091307-9voufmj0p09bndqr