[MRG] merge with main branch
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 9 Mar 2012 08:52:29 +0000 (14:22 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 9 Mar 2012 08:52:29 +0000 (14:22 +0530)
bzr revid: tpa@tinyerp.com-20120309085229-a3nfvxylc5lyqlq9


Trivial merge