Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

indra/llrender/llrender2dutils.cpp

indra/llrender/llrender2dutils.h

indra/llrender/lluiimage.cpp

indra/llrender/lluiimage.h

indra/llui/llfloater.cpp

indra/llui/lliconctrl.cpp

indra/llui/lliconctrl.h

indra/llui/lllayoutstack.cpp

indra/llui/llpanel.cpp

indra/llui/llpanel.h

indra/llui/llresizebar.cpp

indra/llui/llresizebar.h

indra/llui/lluictrl.cpp

indra/llui/lluictrl.h

indra/llui/llview.cpp

indra/llui/llview.h

indra/llui/llviewquery.cpp

indra/llui/llviewquery.h

indra/media_plugins/winmmshim/winmm_shim.cpp

indra/newview/app_settings/settings.xml