Merged revisions 238630 via svnmerge from

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

................
  r238630 | mnicholson | 2010-01-08 13:32:11 -0600 (Fri, 08 Jan 2010) | 12 lines

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

  ........
    r238629 | mnicholson | 2010-01-08 13:20:44 -0600 (Fri, 08 Jan 2010) | 5 lines

    Properly calculate the remaining space in the output string when reducing format strings.

    (closes issue #16560)
    Reported by: goldwein
  ........
................

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