merge

indra/llcommon/llfasttimer.h

indra/llui/llfloater.cpp

indra/llui/lltexteditor.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

...ewview/installers/darwin/fix_application_icon_position.sh

indra/newview/llcallfloater.cpp

indra/newview/llfloaterland.cpp

indra/newview/llfloaterland.h

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterregioninfo.cpp

indra/newview/llpanelvolumepulldown.cpp

indra/newview/llpanelvolumepulldown.h

indra/newview/llstatusbar.cpp

indra/newview/llstatusbar.h

indra/newview/llviewerdisplay.cpp

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewerwindow.cpp

...view/skins/default/textures/bottomtray/Unread_Chiclet.png

...view/skins/default/textures/bottomtray/WellButton_Lit.png