Merged revisions 240547 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 15 Jan 2010 23:06:32 +0000 (23:06 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 15 Jan 2010 23:06:32 +0000 (23:06 +0000)
commita1a277a0147256a3ab8ed377b1dd160d34423071
treef326147fd00ad789c616eb20b11c5d38b5157238
parenta60935478be3af29b57c28f8848914661f6cc042
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/trunk@240548 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Makefile