Merged revisions 139635 via svnmerge from
authorSteve Murphy <murf@digium.com>
Fri, 22 Aug 2008 22:32:35 +0000 (22:32 +0000)
committerSteve Murphy <murf@digium.com>
Fri, 22 Aug 2008 22:32:35 +0000 (22:32 +0000)
commitde1af295c8951923b8681682d2a45b4a98bce4ce
tree7708f2bb3d70a591a116bb96ee0d44c423592a67
parent2488366a753fb228f4cead7bbf0b2d079141b6b8
Merged revisions 139635 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139635 | murf | 2008-08-22 16:24:02 -0600 (Fri, 22 Aug 2008) | 6 lines

I found some problems with the code I committed earlier, when
I merged them into trunk, so I'm coming back to clean up.
And, in the process, I found an error in the code I added
to trunk and 1.6.x, that I'll fix using this patch also.

........

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