Merged revisions 211584 via svnmerge from

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

................
  r211584 | tilghman | 2009-08-10 14:49:41 -0500 (Mon, 10 Aug 2009) | 9 lines

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

  ........
    r211583 | tilghman | 2009-08-10 14:48:48 -0500 (Mon, 10 Aug 2009) | 1 line

    Conversion specifiers, not format specifiers
  ........
................

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