Merged revisions 242729 via svnmerge from

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

................
  r242729 | tilghman | 2010-01-24 23:45:00 -0600 (Sun, 24 Jan 2010) | 9 lines

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

  ........
    r242728 | tilghman | 2010-01-24 23:42:22 -0600 (Sun, 24 Jan 2010) | 2 lines

    Buildbot pointed out an error (thanks, buildbot!)
  ........
................

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