Merged revisions 203381 via svnmerge from

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

................
  r203381 | twilson | 2009-06-25 16:15:11 -0500 (Thu, 25 Jun 2009) | 11 lines

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

  ........
    r203380 | twilson | 2009-06-25 16:13:10 -0500 (Thu, 25 Jun 2009) | 4 lines

    I didn't see that Mark already fixed the underlying issue!

    Yay for removing useless code.
  ........
................

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