Merged revisions 211876 via svnmerge from

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

........
  r211876 | mnicholson | 2009-08-12 14:53:14 -0500 (Wed, 12 Aug 2009) | 11 lines

  Make asterisk handle 423 Interval Too Short messages better.

  This change uses separate values for the acceptable minimum expiry provided by the 423 error and the expiry value stored in the configuration file.  Previously, the value pulled from the configuration file would be overwritten.

  (closes issue #14366)
  Reported by: Nick_Lewis
  Patches:
        sip-expiry-fix1.diff uploaded by mnicholson (license 96)
        chan_sip.c-reqexpiry.patch uploaded by Nick (license 657)
  Tested by: mnicholson
........

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