[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Mon, 14 Jun 2010 07:12:20 +0000 (12:42 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Mon, 14 Jun 2010 07:12:20 +0000 (12:42 +0530)
commitdb02e2bc74ba1cf1d64b6c0785d63f94beebb4a4
tree452ba4e7b985a507b9d95d89a258776f3fca70c7
parent495540330728f2f3a6fb63672e35371e044e2895
parentc530aadd1b8af7de55e36d888788e6daf74e9762
[MERGE]

bzr revid: hmo@tinyerp.com-20100614071220-1i5ngrl54e1t5lfr