[MERGE]: Merge with latest trunk
authorRucha (Open ERP) <rpa@tinyerp.com>
Thu, 7 Apr 2011 06:11:29 +0000 (11:41 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Thu, 7 Apr 2011 06:11:29 +0000 (11:41 +0530)
bzr revid: rpa@tinyerp.com-20110407061129-vg4qspagkufft0vu

1  2 
openerp/addons/base/ir/ir_actions.py

Simple merge