Merged revisions 240548 via svnmerge from

Merged revisions 240548 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r240548 | russell | 2010-01-15 17:06:32 -0600 (Fri, 15 Jan 2010) | 9 lines

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

  ........
    r240547 | russell | 2010-01-15 17:06:11 -0600 (Fri, 15 Jan 2010) | 2 lines

    Fix a spelling error in the asterisk.conf sample.
  ........
................

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