[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 31 Jul 2012 05:22:21 +0000 (10:52 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 31 Jul 2012 05:22:21 +0000 (10:52 +0530)
commit6e5d18a9332c3115b1eac5cd64d022545c56b987
tree91d8c76e628088d7ad210f9c20be932a424da156
parentdfda69555cb00283a90582436d20ddd7ed4fddc0
parent84ea8f59d703c4b5e8dfb0fdde4468ac0a7b410c
[MERGE]

bzr revid: apa@tinyerp.com-20120731052221-0kzi8y7an3fwzn8d