Merged revisions 208924 via svnmerge from

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

................
  r208924 | jpeeler | 2009-07-26 20:20:37 -0500 (Sun, 26 Jul 2009) | 9 lines

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

  ........
    r208923 | jpeeler | 2009-07-26 20:18:31 -0500 (Sun, 26 Jul 2009) | 2 lines

    Fix logic errors from 208746
  ........
................

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