[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 24 Jul 2012 05:29:04 +0000 (10:59 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 24 Jul 2012 05:29:04 +0000 (10:59 +0530)
commitca73595c5275d3cc6143198dd34b8740b6bbc4b4
treeae179af9c6ec012960a85e0be00e4db275ef9dc7
parentc7b29e71c392b2e6a1623464e37ee8d830f301e7
parent61f361bfee1ae021aedef0ebbf3c91d15083cf1a
[MERGE]

bzr revid: apa@tinyerp.com-20120724052904-8o1jxzyu54q2ge9r