[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Tue, 6 Apr 2010 11:20:04 +0000 (16:50 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Tue, 6 Apr 2010 11:20:04 +0000 (16:50 +0530)
commit33b066be0a549f3f6bd6b77deb9cd46f8b460ab3
tree9a6ba1ec32b54df4c1e1fb0d82b9b09fcf2b24ae
parente92975499ffbda6e9baed7f7cf08538611e6e239
parent8326caf5de58ff62c0fd18239e0a7ec7ccceb9b3
[MERGE]

bzr revid: hmo@tinyerp.com-20100406112004-b8ca3c6rr9idhlr4