svn merge -c102054

doc/contributions.txt

indra/cmake/NDOF.cmake

indra/newview/app_settings/settings.xml

indra/newview/linux_tools/client-readme-joystick.txt

indra/newview/linux_tools/client-readme.txt

indra/newview/llfloaterjoystick.cpp

indra/newview/llfloaterjoystick.h

indra/newview/lloverlaybar.cpp

indra/newview/lloverlaybar.h

indra/newview/llviewerjoystick.cpp

indra/newview/llviewerjoystick.h

indra/newview/llviewermenu.cpp

indra/newview/viewer_manifest.py

install.xml