[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 19 Jul 2012 05:29:37 +0000 (10:59 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 19 Jul 2012 05:29:37 +0000 (10:59 +0530)
commita017b3fa362fe8e2069034bcaa67af9829e5d0b4
tree08ca0cc73daf5365db204e1cd133811a86e4388c
parent6c524cf107025999740788718fea82b5722b470b
parentb8129fc2de94f4d469671cef00e712e682d118b0
[MERGE]

bzr revid: apa@tinyerp.com-20120719052937-jrdl4ywlip5utqpo