Merged revisions 55278 via svnmerge from

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

................
r55278 | oej | 2007-02-18 13:35:54 +0100 (Sun, 18 Feb 2007) | 10 lines

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

........
r55277 | oej | 2007-02-18 13:32:13 +0100 (Sun, 18 Feb 2007) | 2 lines

Documentation update (#9053, jsmith)

........

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

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