Merged revisions 329992 via svnmerge from

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

................
  r329992 | mnicholson | 2011-07-28 10:28:21 -0500 (Thu, 28 Jul 2011) | 13 lines

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

  ........
    r329991 | mnicholson | 2011-07-28 10:26:56 -0500 (Thu, 28 Jul 2011) | 6 lines

    check for CONFIG_STATUS_FILE_INVALID when loading the res_fax config file

    Patch by: tzafrir
    Reported by: tzafrir
    (closes issue ASTERISK-18161)
  ........
................

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