Blocked revisions 180155 via svnmerge

........
  r180155 | mmichelson | 2009-03-04 11:03:32 -0600 (Wed, 04 Mar 2009) | 14 lines

  Allow for "magic" pickups to work when we wish to ignore the context

  When the subscription context for a call pickup subscription differs
  from the context of the call pickup target, there's not an easy way
  to divine what context should be used for the pickup. The way to work
  around this is to use PICKUPMARK as the context for the pickup.

  This has been documented in the sip.conf.sample file

  (ABE-1708)

  closes issue #14567
  submitted by: alecdavis
........

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