Merged revisions 333961-333962 via svnmerge from

Merged revisions 333961-333962 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r333961 | may | 2011-08-31 01:21:53 +0400 (Wed, 31 Aug 2011) | 11 lines

  Merged revisions 333947 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r333947 | may | 2011-08-31 01:16:30 +0400 (Wed, 31 Aug 2011) | 5 lines

    cleanups in ACF/ARJ GK replies processing
    fixed long (24 sec) pause if acf/arj proccessed
    before ast_cond_wait called to wait this
  ........
................
  r333962 | may | 2011-08-31 01:53:42 +0400 (Wed, 31 Aug 2011) | 3 lines

  security fix. really drop call if signalling addr is not same as socket
  addr
................

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