[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Tue, 21 Sep 2010 05:17:22 +0000 (10:47 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Tue, 21 Sep 2010 05:17:22 +0000 (10:47 +0530)
bzr revid: uco@tinyerp.com-20100920122036-w3o8pstpxmi09g7x
bzr revid: uco@tinyerp.com-20100921051722-qg7im2qav80pyicy


Trivial merge