Merged revisions 259105 via svnmerge from

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

................
  r259105 | mmichelson | 2010-04-26 16:45:13 -0500 (Mon, 26 Apr 2010) | 9 lines

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

  ........
    r259104 | mmichelson | 2010-04-26 16:44:43 -0500 (Mon, 26 Apr 2010) | 3 lines

    Let compilation succeed warning-free when DONT_OPTIMIZE is turned off.
  ........
................

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