Merged revisions 336500 via svnmerge from

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

................
  r336500 | irroot | 2011-09-19 15:31:50 +0200 (Mon, 19 Sep 2011) | 19 lines
  
  Merged revisions 336499 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336499 | irroot | 2011-09-19 15:27:52 +0200 (Mon, 19 Sep 2011) | 13 lines
    
    A long time ago in a galaxy far far away a IPv6 update was made,
    chan_h323 was not updated causeing all to flee to chan_ooh323.
    
    the brave Jedi [asterisk developers] pondered this miscarrige of justice
    and restored order to the force for the sake of closing out 2 old issues.
    
    (closes issue ASTERISK-17278)
    (closes issue ASTERISK-17500)
    Reported by: dread, sybasesql
    Tested by: irroot
    Reviewed by: IRC (russellb, kpfleming)
  ........
................


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