michael 6b842fd408 Merge with 4e0f46f25a716ac65a4016bac6284685147b5ec9
(note: color.cc is still in the source tree and CMakeLists.txt)
2012-07-09 06:28:15 -04:00
..