Merged revisions 330844 via svnmerge from

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

................
  r330844 | twilson | 2011-08-04 15:51:23 -0500 (Thu, 04 Aug 2011) | 11 lines

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

  ........
    r330843 | twilson | 2011-08-04 15:29:19 -0500 (Thu, 04 Aug 2011) | 4 lines

    Make libsrtp instructions more explicit when linking fails

    (closes issue ASTERISK-18139)
  ........
................

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