Merged revisions 307962 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r307962 | rmudgett | 2011-02-15 13:52:45 -0600 (Tue, 15 Feb 2011) | 1 line
  
  Don't crash when forcing caller id.
........


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