[MERGE] Merged with main addons

bzr revid: tde@openerp.com-20120229105032-x5pvrejzq7okt2j2

diff --cc addons/hr/hr_view.xml
Simple merge

diff --cc addons/mail/mail_message.py
index 8b89b61,b41f121..b22b0c7
--- 1/addons/mail/mail_message.py
--- 2/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@@ -159,10 -157,10 +159,10 @@@ class mail_message(osv.osv)
                      msg_txt += truncate_text(message.body_text)
              else:
                  msg_txt = (message.user_id.name or '/') + _(' on ') + format_date_tz(message.date, tz) + ':\n\t'
-                 msg_txt += message.subject
+                 msg_txt += (message.subject or '')
              result[message.id] = msg_txt
          return result
 -
 +    
      _columns = {
          'partner_id': fields.many2one('res.partner', 'Related partner'),
          'user_id': fields.many2one('res.users', 'Related user', readonly=1),