Merged revisions 172581 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r172581 | twilson | 2009-01-30 15:50:03 -0600 (Fri, 30 Jan 2009) | 2 lines
  
  Remove incorret line from sample config
........


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

configs/features.conf.sample

@@ -23,8 +23,6 @@ context => parkedcalls		; Which context parked calls are in (default parking lot
                                 ; one of: callee, caller, both, no (default is no)
 ;parkedcallreparking = caller   ; Enables or disables DTMF based parking when picking up a parked call.
                                 ; one of: callee, caller, both, no (default is no)
-;parkedcallparking = caller     ; Enables or disables DTMF based one-touch parking when picking up a parked call.
-                                ; one of: callee, caller, both, no (default is no)
 ;parkedcallhangup = caller      ; Enables or disables DTMF based hangups when picking up a parked call.
                                 ; one of: callee, caller, both, no (default is no)
 ;parkedcallrecording = caller   ; Enables or disables DTMF based one-touch recording when picking up a parked call.