Conflicts: bin/addons/base/ir/ir_actions.py bin/netsvc.py bin/report/report_sxw.py bin/tools/translate.py bzr revid: p_christ@hol.gr-20081218164925-uarehzvo3ocu0x2w
Conflicts: bin/addons/base/ir/ir_actions.py bin/netsvc.py bin/report/report_sxw.py bin/tools/translate.py bzr revid: p_christ@hol.gr-20081218164925-uarehzvo3ocu0x2w