Merged revisions 304462 via svnmerge from

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

................
  r304462 | qwell | 2011-01-27 10:48:44 -0600 (Thu, 27 Jan 2011) | 16 lines

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

  ................
    r304461 | qwell | 2011-01-27 10:48:00 -0600 (Thu, 27 Jan 2011) | 9 lines

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

    ........
      r304460 | qwell | 2011-01-27 10:47:03 -0600 (Thu, 27 Jan 2011) | 1 line

      Rerun bootstrap.sh with no changes, so that it is more obvious what my next commit changes.
    ........
  ................
................

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