Merged revisions 286270 via svnmerge from

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

................
  r286270 | oej | 2010-09-11 19:09:22 +0200 (Lör, 11 Sep 2010) | 18 lines

  Merged revisions 286268 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r286268 | oej | 2010-09-11 19:05:16 +0200 (Lör, 11 Sep 2010) | 11 lines

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

    ........
      r286267 | oej | 2010-09-11 18:59:20 +0200 (Lör, 11 Sep 2010) | 4 lines

      Handle error response when we can't make file compatible

      Review: https://reviewboard.asterisk.org/r/911/
    ........
  ................
................

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