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

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 821ed09b0c9b846e0ef206454572da4172db95e1..f50229969f8b38f048c6bedd9ae0c5cbb364b94b 100644 (file)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -1140,7 +1140,7 @@ int ast_waitfor(struct ast_channel *chan, int ms);
  *
  * There are functions such as ast_safe_sleep which will
  * service a channel to ensure that it does not have a
- * have a large backlog of queued frames. When this happens,
+ * large backlog of queued frames. When this happens,
  * we want to hold on to specific frame types and just drop
  * others. This function will tell if the frame we just
  * read should be held onto.