Merged revisions 223206 via svnmerge from

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

................
  r223206 | dvossel | 2009-10-09 12:53:37 -0500 (Fri, 09 Oct 2009) | 16 lines

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

  ........
    r223205 | dvossel | 2009-10-09 12:52:35 -0500 (Fri, 09 Oct 2009) | 10 lines
    fixes sip registration using authuser in user.conf

    (closes issue #14954)
    Reported by: tornblad
    Tested by: mmichelson, tornblad, dvossel
  ........
................

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