merge

indra/llinventory/llinventory.cpp

indra/llinventory/llnotecard.cpp

indra/llkdu/CMakeLists.txt

indra/llkdu/llimagej2ckdu.cpp

indra/llkdu/llimagej2ckdu.h

indra/llkdu/llkdumem.cpp

indra/llkdu/llkdumem.h

indra/llkdu/tests/llimagej2ckdu_test.cpp

indra/llmath/tests/m3math_test.cpp

indra/llmessage/llassetstorage.cpp

indra/llmessage/llavatarnamecache.cpp

indra/llmessage/llcachename.cpp

indra/llplugin/CMakeLists.txt

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llpluginclassmediaowner.h

indra/llui/CMakeLists.txt

indra/llui/llaccordionctrltab.cpp

indra/llui/llbutton.cpp

indra/llui/llbutton.h