Merged revisions 169485 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r169485 | twilson | 2009-01-20 12:40:56 -0600 (Tue, 20 Jan 2009) | 6 lines
  
  Don't play audio to the channel if we've masqueraded
  
  (closes issue #14066)
  Reported by: bluefox
  Tested by: otherwiseguy, bluefox
........


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

main/features.c

@@ -648,7 +648,7 @@ static int ast_park_call_full(struct ast_channel *chan, struct ast_channel *peer
 		*(args->extout) = x;
 
 	if (peer) 
-		ast_copy_string(pu->peername, peer->name, sizeof(pu->peername));
+		ast_copy_string(pu->peername, S_OR(args->orig_chan_name, peer->name), sizeof(pu->peername));
 
 	/* Remember what had been dialed, so that if the parking
 	   expires, we try to come back to the same place */