svn merge -r96886:98039...

etc/message.xml

indra/lib/python/indra/ipc/llmessage.py

indra/llcommon/lltimer.h

indra/llcommon/llversionserver.h

indra/llcommon/llversionviewer.h

indra/llmath/llmodularmath.h

indra/llmessage/llcircuit.cpp

indra/llmessage/llcircuit.h

indra/llmessage/llmail.cpp

indra/llmessage/llmail.h

indra/llmessage/llmessagetemplate.cpp

indra/llmessage/llmessagetemplate.h

indra/llmessage/llmessagetemplateparser.cpp

indra/llmessage/lltemplatemessagereader.cpp

indra/llmessage/lltemplatemessagereader.h

indra/llmessage/message.cpp

indra/llmessage/message.h

indra/lscript/lscript_compile/lscript_tree.cpp

indra/newview/English.lproj/InfoPlist.strings

indra/newview/Info-SecondLife.plist