Merged revisions 168547 via svnmerge from

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

................
  r168547 | tilghman | 2009-01-13 11:51:12 -0600 (Tue, 13 Jan 2009) | 13 lines

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

  ........
    r168546 | tilghman | 2009-01-13 11:48:00 -0600 (Tue, 13 Jan 2009) | 6 lines

    If either conditional is NULL, don't try copying it.
    (closes issue #14226)
     Reported by: caspy
     Patches:
           20090113__bug14226.diff.txt uploaded by Corydon76 (license 14)
  ........
................

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