merge.

indra/llui/lldockablefloater.cpp

indra/llui/lltextbase.h

indra/media_plugins/quicktime/media_plugin_quicktime.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llappviewer.cpp

indra/newview/llbottomtray.cpp

indra/newview/llbottomtray.h

indra/newview/llchannelmanager.cpp

indra/newview/llchannelmanager.h

indra/newview/llchiclet.cpp

indra/newview/lldebugview.cpp

indra/newview/llfavoritesbar.cpp

indra/newview/llfolderview.cpp

indra/newview/llfriendcard.cpp

indra/newview/llfriendcard.h

indra/newview/lljoystickbutton.cpp

indra/newview/lljoystickbutton.h

indra/newview/lllandmarkactions.cpp