Merged revisions 302921 via svnmerge from

Merged revisions 302921 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302921 | russell | 2011-01-20 10:12:15 -0600 (Thu, 20 Jan 2011) | 9 lines

  Merged revisions 302920 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r302920 | russell | 2011-01-20 10:11:58 -0600 (Thu, 20 Jan 2011) | 2 lines

    Resolve a compiler warning.
  ........
................

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