merge

indra/llui/llflatlistview.h

indra/newview/CMakeLists.txt

indra/newview/llavataractions.cpp

indra/newview/llpanelavatar.cpp

indra/newview/llpanelavatar.h

indra/newview/llpanelme.cpp

indra/newview/llpanelme.h

indra/newview/llpanelpeople.cpp

indra/newview/llpanelpeople.h

indra/newview/llpanelpicks.h

indra/newview/llpanelprofile.cpp

indra/newview/llpanelprofile.h

indra/newview/llpanelprofileview.cpp

indra/newview/llpanelprofileview.h

indra/newview/llsidetray.cpp

indra/newview/skins/default/xui/de/panel_me.xml

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

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

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

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