Merged revisions 283123 via svnmerge from

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

................
  r283123 | rmudgett | 2010-08-20 11:46:22 -0500 (Fri, 20 Aug 2010) | 9 lines

  Merged revision 278274 from
  https://origsvn.digium.com/svn/asterisk/trunk

  ..........
    r278274 | rmudgett | 2010-07-20 17:38:13 -0500 (Tue, 20 Jul 2010) | 1 line

    Reference correct struct member for unlikely event PRI_EVENT_CONFIG_ERR.
  ..........
................

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