Merged revisions 291284 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291284 | lmadsen | 2010-10-12 12:20:43 -0500 (Tue, 12 Oct 2010) | 15 lines
  
  Merged revisions 291280 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r291280 | lmadsen | 2010-10-12 12:20:02 -0500 (Tue, 12 Oct 2010) | 7 lines
    
    Add undocumented variables to phoneprov.conf.sample
    
    
    (closes issue #18107)
    Reported by: lathama
    Patches:
          phoneprov.conf.sample.diff uploaded by lathama (license 1028)
  ........
................


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