Merged revisions 336734 via svnmerge from

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

................
  r336734 | tilghman | 2011-09-19 15:29:40 -0500 (Mon, 19 Sep 2011) | 18 lines

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

  ........
    r336733 | tilghman | 2011-09-19 15:27:03 -0500 (Mon, 19 Sep 2011) | 11 lines

    Various changes to allow 1.8 to compile on Mac OS X Lion (10.7)

    * Makefile workaround for 10.6 extended to work on 10.7 and later.
    * Now uses the 'weak' symbol for Lion systems, which no longer support
      'weak_import'

    Closes ASTERISK-17612.
    Closes ASTERISK-18213.

    Tested by: tilghman, oej.
  ........
................

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