[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 19 Mar 2012 05:23:37 +0000 (10:53 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 19 Mar 2012 05:23:37 +0000 (10:53 +0530)
commit9993724b55a636ea4b3ea2b7941f5031fe86502c
tree115eb5b59bea51a2a13fce14bd25410b66a86906
parenta2178b69e7d146fc33bf77dbda9b6ad3b59f5977
parent5704fccaec79bc1c2835c70d2b3e1035263900b1
[MERGE]

bzr revid: apa@tinyerp.com-20120319052337-6k0kzcszg81q4gzq