Merged revisions 67061 via svnmerge from

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

................
r67061 | tilghman | 2007-06-04 12:11:43 -0500 (Mon, 04 Jun 2007) | 10 lines

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

........
r67060 | tilghman | 2007-06-04 12:10:30 -0500 (Mon, 04 Jun 2007) | 2 lines

Add revision Id tags (by request of tzafrir)

........

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

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