[MERGE] cleaned imports.

bzr revid: vmt@openerp.com-20120118111226-an43skezei7dla2v

diff --cc openerp/addons/base/ir/ir_actions.py
index f02269f,96b6bae..ecb2106
--- 1/openerp/addons/base/ir/ir_actions.py
--- 2/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@@ -18,7 -18,6 +18,8 @@@
  #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
  ##############################################################################
++
 +import ast
  import copy
  import logging
  import os