Blocked revisions 187211 via svnmerge

........
  r187211 | jpeeler | 2009-04-08 16:00:39 -0500 (Wed, 08 Apr 2009) | 20 lines

  Add timer for features so that backup bridge config can go away

  The biggest change done here was elimination of the backup_config for use with
  features. Previously, the bridging code upon detecting a feature would set the
  start time of the bridge to the start time of the feature. Then after the
  feature had either expired or timed out the start time would be reset to the
  true bridge start time from the backup_config. Now, the time differences are
  calculated with respect to the newly added feature_start_time timeval instead.

  There should be no behavior changes from the previous functionality aside from
  the bridge timing being unaffected by either valid or partial feature matches.
  Previously the timing would be increased by the length of time configured for
  featuredigittimeout, which was probably never noticed.

  (closes issue #14503)
  Reported by: KNK
  Tested by: jpeeler

  Review: http://reviewboard.digium.com/r/179/
........

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