Merged revisions 242857 via svnmerge from

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

................
  r242857 | tilghman | 2010-01-25 14:18:15 -0600 (Mon, 25 Jan 2010) | 9 lines

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

  ........
    r242852 | tilghman | 2010-01-25 14:15:45 -0600 (Mon, 25 Jan 2010) | 2 lines

    Restore FreeBSD to able-to-compile-ish-mode
  ........
................

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