Merged revisions 229499 via svnmerge from

Merged revisions 229499 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r229499 | dbrooks | 2009-11-11 13:48:18 -0600 (Wed, 11 Nov 2009) | 15 lines

  Merged revisions 229498 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r229498 | dbrooks | 2009-11-11 13:46:19 -0600 (Wed, 11 Nov 2009) | 8 lines

    Solaris doesn't like NULL going to ast_log

    Solaris will crash if NULL is passed to ast_log. This simple patch simply uses S_OR to
    get around this.

    (closes issue #15392)
    Reported by: yrashk
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@229501 65c4cc65-6c06-0410-ace0-fbb531ad65f3