Merged revisions 218224 via svnmerge from

Merged revisions 218224 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218224 | mnicholson | 2009-09-14 09:57:23 -0500 (Mon, 14 Sep 2009) | 14 lines

  Merged revisions 218223 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r218223 | mnicholson | 2009-09-14 09:53:57 -0500 (Mon, 14 Sep 2009) | 8 lines

    Ensure we don't pickup ourselves when doing pickup by exten.

    (closes issue #15100)
    Reported by: lmsteffan
    Patches:
          (modified) pickup.patch uploaded by lmsteffan (license 779)
  ........
................

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