[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)
bzr revid: mdi@tinyerp.com-20120321065933-jug06iibfwf923wq


Trivial merge