Merged revisions 291230 via svnmerge from

Merged revisions 291230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291230 | lmadsen | 2010-10-12 11:08:04 -0500 (Tue, 12 Oct 2010) | 10 lines

  Merged revisions 291229 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r291229 | lmadsen | 2010-10-12 11:07:28 -0500 (Tue, 12 Oct 2010) | 2 lines

    Add documention that mentions options are defined but not used.
    (Issue #18101)
  ........
................

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