Merged revisions 290289 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r290289 | tilghman | 2010-10-05 09:15:46 -0500 (Tue, 05 Oct 2010) | 2 lines
  
  Restore run directory for OS X, as well as standardizing some other paths to Mac OS X.
........


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