[svn-commits] mmichelson: branch 1.6.2 r265001 - in /branches/1.6.2: ./ include/asterisk/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri May 21 11:55:11 2010
New Revision: 265001

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=265001
Log:
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.
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/include/asterisk/channel.h

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/include/asterisk/channel.h?view=diff&rev=265001&r1=265000&r2=265001
==============================================================================
--- branches/1.6.2/include/asterisk/channel.h (original)
+++ branches/1.6.2/include/asterisk/channel.h Fri May 21 11:55:11 2010
@@ -1140,7 +1140,7 @@
  *
  * 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.