Merged revisions 297535 via svnmerge from

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

................
  r297535 | seanbright | 2010-12-03 12:41:30 -0500 (Fri, 03 Dec 2010) | 9 lines

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

  ........
    r297534 | seanbright | 2010-12-03 12:40:52 -0500 (Fri, 03 Dec 2010) | 3 lines

    The CLI command should not contain <placeholder>s, these are for descriptions.
  ........
................

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