merge

indra/llrender/llfontgl.cpp

indra/llrender/llfontgl.h

indra/llui/llcheckboxctrl.cpp

indra/llui/llconsole.cpp

indra/llui/llmenubutton.h

indra/llui/llmenugl.cpp

indra/llui/lltextbase.cpp

indra/newview/llchathistory.cpp

indra/newview/lldateutil.cpp

indra/newview/llfloaterabout.cpp

indra/newview/llfloaterworldmap.cpp

indra/newview/llfloaterworldmap.h

indra/newview/llhudtext.cpp

indra/newview/llinspect.h

indra/newview/llinspectavatar.cpp

indra/newview/llinspectobject.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp

indra/newview/skins/default/colors.xml

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