Merge rev 100626 from Asterisk 1.4. The svnmerge of this commit was a NoOp, since
authorRussell Bryant <russell@russellbryant.com>
Mon, 28 Jan 2008 18:41:23 +0000 (18:41 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 28 Jan 2008 18:41:23 +0000 (18:41 +0000)
commitbcf72e1adbc48e46feba5ff638f11f4703f92b06
treed1352a5fb4fabf2bc7e7826e43bea9085b93e5f9
parentb437d33fe54073965d4411275bf32439dbf40e30
Merge rev 100626 from Asterisk 1.4.  The svnmerge of this commit was a NoOp, since
res_features doesn't exist in trunk.  Thanks to qwell for pointing it out!

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