Merged revisions 268653,268731 via svnmerge from

Merged revisions 268653,268731 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r268653 | tilghman | 2010-06-07 12:14:40 -0500 (Mon, 07 Jun 2010) | 2 lines

  Avoid unloading res_smdi twice.

  (closes issue #17237)
  Reported by: pabelanger
........
  r268731 | tilghman | 2010-06-07 13:59:27 -0500 (Mon, 07 Jun 2010) | 4 lines

  Event well was going dry.

  (issue #17234)
........

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