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

indra/integration_tests/llimage_libtest/llimage_libtest.cpp

indra/llimage/llimage.h

indra/llimage/llimagej2c.cpp

indra/llimage/llimagej2c.h

indra/llimagej2coj/llimagej2coj.cpp

indra/llimagej2coj/llimagej2coj.h

indra/llkdu/llimagej2ckdu.cpp

indra/llkdu/llimagej2ckdu.h

indra/llkdu/tests/llimagej2ckdu_test.cpp

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_minimal.xml

indra/newview/app_settings/settings_per_account.xml

indra/newview/llbottomtray.cpp

indra/newview/llfloatersearch.cpp

indra/newview/llfloatersounddevices.cpp

indra/newview/llpanellogin.cpp

indra/newview/llpanelvoicedevicesettings.cpp

indra/newview/llviewermessage.cpp

indra/newview/llviewertexturelist.cpp

indra/newview/llvoicechannel.cpp