Merged revisions 300433 via svnmerge from

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

................
  r300433 | lmadsen | 2011-01-04 15:00:55 -0600 (Tue, 04 Jan 2011) | 15 lines

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

  ........
    r300431 | lmadsen | 2011-01-04 15:00:29 -0600 (Tue, 04 Jan 2011) | 7 lines

    Add some documentation to users.conf.sample.

    (closes issue #18531)
    Reported by: lathama
    Patches:
          users.conf.sample2.diff uploaded by lathama (license 1028)
    Tested by: lathama
  ........
................

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