Merged revisions 236434 via svnmerge from

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

................
  r236434 | tilghman | 2009-12-27 12:20:53 -0600 (Sun, 27 Dec 2009) | 9 lines

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

  ........
    r236433 | tilghman | 2009-12-27 12:19:38 -0600 (Sun, 27 Dec 2009) | 2 lines

    Turn on colors in the daemon, since there's many requests for it on Ubuntu.
  ........
................

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