Merged revisions 297909 via svnmerge from

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

................
  r297909 | tilghman | 2010-12-08 12:06:04 -0600 (Wed, 08 Dec 2010) | 11 lines

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

  ........
    r297908 | tilghman | 2010-12-08 12:04:38 -0600 (Wed, 08 Dec 2010) | 4 lines

    Use inheritance to get correct results for SIPFROMDOMAIN.

    (from an internal Digium discussion)
  ........
................

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