Merged revisions 226812 via svnmerge from

Merged revisions 226812 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r226812 | tilghman | 2009-11-02 11:15:31 -0600 (Mon, 02 Nov 2009) | 15 lines

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

  ........
    r226811 | tilghman | 2009-11-02 11:14:20 -0600 (Mon, 02 Nov 2009) | 8 lines

    Don't allow two separate instances of safe_asterisk when restarting from the init script.
    (closes issue #14562)
     Reported by: davidw
     Patches:
           Initially 20091022__issue14562.diff.txt uploaded by tilghman (license 14)
           Modified to 20091030__Issue14562_diff.txt uploaded by davidw (license 780)
     Tested by: davidw
  ........
................

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