Merged revisions 301311 via svnmerge from

Merged revisions 301311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301311 | pabelanger | 2011-01-11 14:16:06 -0500 (Tue, 11 Jan 2011) | 9 lines

  Merged revisions 301310 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r301310 | pabelanger | 2011-01-11 14:14:31 -0500 (Tue, 11 Jan 2011) | 2 lines

    Fix a logic issue when passing context ARG
  ........
................

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