[MERGE]: Merged with team branch.
authoruco (Open ERP) <uco@tinyerp.com>
Fri, 27 Aug 2010 04:48:32 +0000 (10:18 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Fri, 27 Aug 2010 04:48:32 +0000 (10:18 +0530)
bzr revid: uco@tinyerp.com-20100827044832-vgcnp3p2qbmau20o


Trivial merge