Merged revisions 332940 via svnmerge from

Merged revisions 332940 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r332940 | rmudgett | 2011-08-22 16:23:40 -0500 (Mon, 22 Aug 2011) | 14 lines

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

  ........
    r332939 | rmudgett | 2011-08-22 16:22:24 -0500 (Mon, 22 Aug 2011) | 7 lines

    Minor code optimizations.

    * Simplify ast_category_browse() logic for easier understanding.

    * Remove dead code in ast_variable_delete() and simplify some of its
    logic.
  ........
................

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