merge.

indra/llcommon/lleventapi.h

indra/llcommon/lleventdispatcher.cpp

indra/llcommon/lleventdispatcher.h

indra/llcommon/llpreprocessor.h

indra/llcommon/tests/lltreeiterators_test.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltextbox.cpp

indra/llui/lltextbox.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/llui/lluicolortable.cpp

indra/llui/lluictrl.cpp

indra/llui/lluictrlfactory.cpp

indra/media_plugins/quicktime/media_plugin_quicktime.cpp

indra/newview/CMakeLists.txt

indra/newview/linux_tools/wrapper.sh

indra/newview/llchathistory.cpp

indra/newview/llchathistory.h

indra/newview/llchatitemscontainerctrl.cpp