Merged revisions 197621 via svnmerge from

Merged revisions 197621 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r197621 | eliel | 2009-05-28 12:01:48 -0400 (Thu, 28 May 2009) | 19 lines

  Merged revisions 197562 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r197562 | eliel | 2009-05-28 11:21:32 -0400 (Thu, 28 May 2009) | 13 lines

    Use the address we already know when reloading a peer with nat=yes.

    If we already have an address for a peer, and we are reloading the sip
    configuration, try to use that address to contact the peer, instead of
    getting it from the Contact.

    (closes issue #15194)
    Reported by: ibc
    Patches:
          sip.patch uploaded by eliel (license 64)
          Tested by: manwe
  ........
................

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