Merged revisions 202415 via svnmerge from

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

................
  r202415 | russell | 2009-06-22 11:05:08 -0500 (Mon, 22 Jun 2009) | 9 lines

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

  ........
    r202414 | russell | 2009-06-22 11:00:00 -0500 (Mon, 22 Jun 2009) | 2 lines

    Make Polycom subscription type override check more explicit.
  ........
................

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