[MERGE] base.action.rule: better handle non-ASCII data

Also fixes the `regex_history` expression
that should search on the `subject` field
now (it was renamed in 6.1).

lp bug: https://launchpad.net/bugs/921442 fixed

bzr revid: odo@openerp.com-20120316144251-ks16hvvfgh2hiduk

diff --cc addons/base_action_rule/base_action_rule.py
index 249fea8,2588559..50ebd96
--- 1/addons/base_action_rule/base_action_rule.py
--- 2/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@@ -24,6 -24,6 +24,7 @@@ from tools.translate import 
  from datetime import datetime
  from datetime import timedelta
  from tools.safe_eval import safe_eval
++from tools import ustr
  import pooler
  import re
  import time

diff --cc addons/crm/crm_action_rule.py
index 76876df,27ee6e4..ec489ff
--- 1/addons/crm/crm_action_rule.py
--- 2/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@@ -23,6 -23,6 +23,7 @@@ import r
  import tools
  
  from tools.translate import _
++from tools import ustr
  from osv import fields
  from osv import osv