Merge

.hgtags

build.sh

doc/contributions.txt

indra/cmake/GetPrerequisites_2_8.cmake

indra/cmake/LLAddBuildTest.cmake

indra/llcommon/llmd5.h

indra/llcommon/llversionviewer.h

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llmath/tests/m3math_test.cpp

indra/llui/llcombobox.cpp

indra/llui/llcombobox.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_per_account.xml

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/featuretable_xp.txt

indra/newview/llagent.cpp