[MERGE]:merged with parent
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 07:23:13 +0000 (12:53 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 07:23:13 +0000 (12:53 +0530)
commit378ce6633ab9989130e6352111ad93569bb780b9
treeb8b19c2dcc93a2b66f465ccf17ac14dee69b0e19
parentf41efa7f9edec3b9444b40415a30b3a5a6099af8
parent3fb58139a4d61741bfe98544e226a20e4689069a
[MERGE]:merged with parent

bzr revid: apa@tinyerp.com-20120720072313-1zgl21skbr4ezf1s