Merged revisions 311930 via svnmerge from

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

........
  r311930 | tilghman | 2011-03-31 01:43:18 -0500 (Thu, 31 Mar 2011) | 6 lines
  
  Incorrect default example; the field is actually internally named "clid", not "callerid".
  
  (closes issue #19040)
  Reported by: wcselby
  Tested by: tilghman
........


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