Merged revisions 265000 via svnmerge from

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

................
  r265000 | mmichelson | 2010-05-21 11:54:21 -0500 (Fri, 21 May 2010) | 9 lines

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

  ........
    r264999 | mmichelson | 2010-05-21 11:53:53 -0500 (Fri, 21 May 2010) | 3 lines

    Fix grammatical error in comment.
  ........
................

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