automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@52995 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 1 deletions

diff --git a/channel.c b/channel.c
index 2a22bed3c..577d0c799 100644
--- a/channel.c
+++ b/channel.c
@@ -2476,7 +2476,7 @@ struct ast_channel *__ast_request_and_dial(const char *type, int format, void *d
 						state = f->subclass;
 						ast_frfree(f);
 						break;
-					} else if (f->subclass == AST_CONTROL_PROGRESS) {
+					} else if (f->subclass == AST_CONTROL_PROGRESS || f->subclass == AST_CONTROL_PROCEEDING) {
 						/* Ignore */
 					} else if (f->subclass == -1) {
 						/* Ignore -- just stopping indications */