Merged revisions 48888 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48888 | qwell | 2006-12-22 15:40:20 -0600 (Fri, 22 Dec 2006) | 2 lines

Note to self: Run make before committing...

........


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