[MERGE]:merged with parent
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 06:57:49 +0000 (12:27 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 06:57:49 +0000 (12:27 +0530)
commited91ab7b199f2f670734aad549743262dc057993
treee2cfe1fa6c18ee9efee2034e0024823d320cf6ae
parent38f8cf9820f25a911d73a40bfeb09dd63a9f85f7
parentc1c63785424aa7ed4a455ff543c39f260aa6d5be
[MERGE]:merged with parent

bzr revid: apa@tinyerp.com-20120720065749-k1qlqbbatgypzbzv