[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Tue, 14 Sep 2010 09:03:44 +0000 (14:33 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Tue, 14 Sep 2010 09:03:44 +0000 (14:33 +0530)
commit8a3839601d508dfe70dc5cbc56a0c75bf8ec1aad
treec181a09e57abd439573c912a9f799202b61e8671
parente60a6f32bfa35d5b468645ae2be6d0dd5a6d4969
parent88aec74613c4b6865eae29d409951172ae26969b
[MERGE]

bzr revid: uco@tinyerp.com-20100914090344-bbqjb5ch93d3lsq7