[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Mon, 12 Jul 2010 07:46:57 +0000 (13:16 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Mon, 12 Jul 2010 07:46:57 +0000 (13:16 +0530)
commit831a292458eb0aedfaa67715bc4401af3737fd63
tree4e942059d5a45e255f3f9feed1113366a676f2d7
parentfad9edc19eb7e0ac32aab96f6f299e328b6574f2
parent19e5b1e3d0c5e5aab3d4994b490fa5e98823fb93
[MERGE]

bzr revid: hmo@tinyerp.com-20100712074657-wiqjddnycxzq2qz5