Merged revisions 230246 via svnmerge from

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

........
  r230246 | kpfleming | 2009-11-15 11:19:06 -0600 (Sun, 15 Nov 2009) | 6 lines

  Correct mistaken option name in error message.

  The configuration option for allowing hosts to make non-token-based calls
  is 'calltokenoptional', not 'calltokenignore'. (reported on asterisk-users)
........

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