merge

indra/llui/llflatlistview.cpp

indra/llui/llflatlistview.h

indra/llui/lltexteditor.cpp

indra/newview/llchathistory.cpp

indra/newview/llfavoritesbar.cpp

indra/newview/llnavigationbar.cpp

indra/newview/llnavigationbar.h

indra/newview/llnearbychat.cpp

indra/newview/llnearbychathandler.cpp

indra/newview/llpanellandmarks.cpp

indra/newview/llpanellandmarks.h

indra/newview/llscreenchannel.cpp

indra/newview/llvoiceclient.cpp

indra/newview/skins/default/xui/en/notifications.xml

indra/newview/skins/default/xui/en/panel_people.xml

indra/newview/skins/default/xui/en/panel_pick_list_item.xml

...a/newview/skins/default/xui/en/widgets/flat_list_view.xml