[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 17 Jul 2012 04:55:28 +0000 (10:25 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 17 Jul 2012 04:55:28 +0000 (10:25 +0530)
commit3d3ceba3fa0152cffa43d328f586daeb4f25442e
tree4fb53809e6b966c2392b48bd9d31700d7596f4b1
parent6dac47419fa0b65f6be078e74e2664fcb95a2bc4
parentb79c49dfd996b0f9b3c030f0bcf2d509b4992948
[MERGE]

bzr revid: apa@tinyerp.com-20120717045528-8g7wsjuybe0s3epy