Blocked revisions 172639 via svnmerge

........
  r172639 | twilson | 2009-01-30 18:15:09 -0600 (Fri, 30 Jan 2009) | 5 lines

  Rename new parkedcallparking option to parkedcallreparking

  Since this option actually already existed in 1.6.0+, use the same name so as
  not to confuse people when they upgrade
........

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