[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Tue, 9 Mar 2010 11:25:34 +0000 (16:55 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Tue, 9 Mar 2010 11:25:34 +0000 (16:55 +0530)
commit8cc8ca8e68cf12d2f06a82417e5196f8792a8ece
tree9a3b06e1b11bb5d1e97989c3b86ea6c78c30bb2e
parent236aec74aff4d9992a739e6776bf871eca652816
parent248eabc2ca2f7a8a2acef5d5d4d5b5d1c1789d2e
[MERGE]

bzr revid: hmo@tinyerp.com-20100309112534-bibte8vo972fqjd4