Automated merge with http://hg.secondlife.com/viewer-development

indra/integration_tests/llimage_libtest/llimage_libtest.cpp

indra/integration_tests/llui_libtest/llui_libtest.cpp

indra/linux_updater/linux_updater.cpp

indra/llmath/v3color.h

indra/llrender/llfontgl.cpp

indra/llrender/llfontgl.h

indra/llrender/llfontregistry.cpp

indra/llrender/llfontregistry.h

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llfloaterreg.cpp

indra/llui/llnotifications.cpp

indra/llui/llpanel.cpp

indra/llui/llpanel.h

indra/llui/lltransutil.cpp

indra/llui/llui.cpp

indra/llui/llui.h

indra/llui/lluicolortable.cpp

indra/llui/lluictrlfactory.cpp

indra/llui/lluictrlfactory.h