[MERGE]:merge from trunk server
authornch@tinyerp.com <>
Thu, 11 Mar 2010 06:12:16 +0000 (11:42 +0530)
committernch@tinyerp.com <>
Thu, 11 Mar 2010 06:12:16 +0000 (11:42 +0530)
commit0dfa91ac8a0851d7972e8319f9fc26dfde7df731
treec7d56a9eb55cdeedce749933b122d0a60907ee5c
parentadf77f4a016696f79cc5b9812b15672a672b5009
parent63e89d02192ce3b9c8faa768ba8199979f2025e8
[MERGE]:merge from trunk server

bzr revid: nch@tinyerp.com-20100311061216-qt85tz7c7nsmbp57