Merged revisions 267972 via svnmerge from

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

................
  r267972 | tilghman | 2010-06-04 11:31:25 -0500 (Fri, 04 Jun 2010) | 9 lines

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

  ........
    r267971 | tilghman | 2010-06-04 11:27:02 -0500 (Fri, 04 Jun 2010) | 2 lines

    As-fixiate the build process
  ........
................

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