[MRG] merge with main addons.
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 18 Apr 2012 06:41:24 +0000 (12:11 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 18 Apr 2012 06:41:24 +0000 (12:11 +0530)
bzr revid: tpa@tinyerp.com-20120417101436-rdykpvm14i70nu50
bzr revid: tpa@tinyerp.com-20120418064124-1tw84eusgsn9imff


Trivial merge