Merged revisions 284666 via svnmerge from

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

................
  r284666 | tilghman | 2010-09-02 11:11:15 -0500 (Thu, 02 Sep 2010) | 9 lines
  
  Merged revisions 284665 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r284665 | tilghman | 2010-09-02 11:07:19 -0500 (Thu, 02 Sep 2010) | 2 lines
    
    Fixing build.
  ........
................


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