[MRG] Merge main addons.
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 15 Dec 2011 11:08:11 +0000 (16:38 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Thu, 15 Dec 2011 11:08:11 +0000 (16:38 +0530)
bzr revid: tpa@tinyerp.com-20111215110811-nzsn3z8cui8dcnyo


Trivial merge