Merged revisions 368928 via svnmerge from

Merged revisions 368928 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r368928 | mmichelson | 2012-06-14 10:25:23 -0500 (Thu, 14 Jun 2012) | 10 lines

  Revert Makefile change to remove embedding res_adsi.so

  The change has resulted in a linking error for certain versions
  of GCC. This is much worse than the original issue, so for now,
  temporarily revert the change. A more thorough change will be
  sought out.
  ........

  Merged revisions 368927 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

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