Merged revisions 331418 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Wed, 10 Aug 2011 18:27:16 +0000 (18:27 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 10 Aug 2011 18:27:16 +0000 (18:27 +0000)
commit02ecb12f64043fc73e05b71c4218c12fa8311e3e
tree1f0f938ec86fc8f8331335d5f3616e5acc7b4571
parentdc9513a69d8d8d12e80a287d8f99c7d3de5d249a
Merged revisions 331418 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331418 | rmudgett | 2011-08-10 13:25:08 -0500 (Wed, 10 Aug 2011) | 6 lines

  Revert -r318141.  It was a band-aid that only partially fixed parking.

  A better fix is on reviewboard review 1358.

  (issue ASTERISK-17374)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
CHANGES
main/features.c