Merged revisions 205600 via svnmerge from

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

................
  r205600 | dvossel | 2009-07-09 11:19:09 -0500 (Thu, 09 Jul 2009) | 9 lines

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

  ........
    r205599 | dvossel | 2009-07-09 11:18:09 -0500 (Thu, 09 Jul 2009) | 2 lines

    Changing ast_samp2tv to not use floating point.
  ........
................

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