Merged revisions 226382 via svnmerge from

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

........
  r226382 | lmadsen | 2009-10-28 15:06:13 -0500 (Wed, 28 Oct 2009) | 9 lines

  Update documentation in sip.conf.sample.

  Update the documentation in sip.conf.sample in order to make it more clear
  that directmedia/canreinvite do not cause Asterisk to ignore reINVITEs. It
  is only used to stop Asterisk from generating a reINVITE, but does not stop
  it from accepting them if necessary.

  (closes issue #15644)
  Reported by: lmadsen
........

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