Merged revisions 164419 via svnmerge from

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

................
r164419 | mmichelson | 2008-12-15 13:51:24 -0600 (Mon, 15 Dec 2008) | 12 lines

Merged revisions 164416 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r164416 | mmichelson | 2008-12-15 13:45:07 -0600 (Mon, 15 Dec 2008) | 4 lines

Add notes to autoservice and pbx doxygen regarding a potential
deadlock scenario so that it is avoided in the future

........

................

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