Merged revisions 296992 via svnmerge from

Merged revisions 296992 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r296992 | tilghman | 2010-12-01 11:01:56 -0600 (Wed, 01 Dec 2010) | 19 lines

  Merged revisions 296991 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r296991 | tilghman | 2010-12-01 11:01:00 -0600 (Wed, 01 Dec 2010) | 12 lines

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

    ........
      r296990 | tilghman | 2010-12-01 10:59:26 -0600 (Wed, 01 Dec 2010) | 5 lines

      Clarify documentation on how we store codec preference lists.

      (closes issue #18397)
       Reported by: birgita
    ........
  ................
................

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