Merged revisions 299138 via svnmerge from

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

................
  r299138 | tilghman | 2010-12-20 12:17:28 -0600 (Mon, 20 Dec 2010) | 9 lines
  
  Merged revisions 299136 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r299136 | tilghman | 2010-12-20 12:16:37 -0600 (Mon, 20 Dec 2010) | 2 lines
    
    Documentation fix
  ........
................


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