Merged revisions 234256 via svnmerge from

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

................
  r234256 | qwell | 2009-12-10 15:01:39 -0600 (Thu, 10 Dec 2009) | 16 lines

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

  ........
    r234255 | qwell | 2009-12-10 14:58:09 -0600 (Thu, 10 Dec 2009) | 9 lines

    Fix unselecting of menuselect options via GLOBAL_MAKEOPTS and USER_MAKEOPTS.

    (closes issue #16296)
    Reported by: abelbeck
    Patches:
          issue16296-20091210.diff uploaded by qwell (license 4)
    (abelbeck described a fix, which I expanded upon)
    Tested by: abelbeck, qwell, lmadsen
  ........
................

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