Conflicts: bin/addons/base/ir/ir_actions.py bzr revid: p_christ@hol.gr-20101123135224-190hp303ipjncml8