[MERGE] Merge with main branch
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 21 Mar 2012 06:59:33 +0000 (12:29 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 21 Mar 2012 06:59:33 +0000 (12:29 +0530)
commit453349cb5816f6f4545555267c72dce862ecc31a
treece24e4c9324493e8fddb0ac09f68badddd76a649
parent38a3a8448a761f8e7313e9578920f74d70987eeb
parent2ed9a957e8713b5c1860a82f0c74b09f337d49f6
[MERGE] Merge with main branch

bzr revid: mdi@tinyerp.com-20120321065933-jug06iibfwf923wq