automerge commit

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

1 files changed, 2 insertions, 2 deletions

diff --git a/res/res_features.c b/res/res_features.c
index 599ad398f..f83cadecc 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -742,7 +742,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
 					}
 					if (!ast_strlen_zero(xfersound) && !ast_streamfile(transferer, xfersound, transferer->language)) {
 						if (ast_waitstream(transferer, "") < 0) {
-							ast_log(LOG_WARNING, "Failed to play courtesy tone!\n");
+							ast_log(LOG_WARNING, "Failed to play transfer sound!\n");
 						}
 					}
 					ast_moh_stop(transferee);
@@ -806,7 +806,7 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
 	
 					if (!ast_strlen_zero(xfersound) && !ast_streamfile(newchan, xfersound, newchan->language)) {
 						if (ast_waitstream(newchan, "") < 0) {
-							ast_log(LOG_WARNING, "Failed to play courtesy tone!\n");
+							ast_log(LOG_WARNING, "Failed to play transfer sound!\n");
 						}
 					}
 					ast_bridge_call_thread_launch(tobj);