Merged revisions 46930 via svnmerge from

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

................
r46930 | file | 2006-11-02 11:06:39 -0500 (Thu, 02 Nov 2006) | 10 lines

Merged revisions 46920 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r46920 | file | 2006-11-02 11:02:27 -0500 (Thu, 02 Nov 2006) | 2 lines

Repeat after me oej: I will at least make sure my code compiles before I commit it.

........

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


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