[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)
commit9107db52091d25ab45fe210494cb36f1e6331790
tree094cf5f1bddc2b20b343e948c93677e298fc6192
parent8ba31fc711e01b9ae48ad6b3fe26b34ea1bd8d4a
parent0c1f4b268c6cd663e0077707cd6951106b2f9db5
[MERGE]

bzr revid: uco@tinyerp.com-20100920122036-w3o8pstpxmi09g7x
bzr revid: uco@tinyerp.com-20100921051722-qg7im2qav80pyicy