Merged revisions 238231 via svnmerge from

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

................
  r238231 | tilghman | 2010-01-06 15:45:17 -0600 (Wed, 06 Jan 2010) | 11 lines

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

  ........
    r238230 | tilghman | 2010-01-06 15:41:55 -0600 (Wed, 06 Jan 2010) | 4 lines

    Revise documentation on disposition values to the actual values used.
    (closes issue #16289)
     Reported by: wdoekes
  ........
................

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