Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.

indra/llcharacter/llbvhloader.cpp

indra/llcharacter/llkeyframemotion.cpp

indra/llcharacter/llkeyframemotionparam.cpp

indra/llcommon/llerror.h

indra/llcommon/llfile.cpp

indra/llcommon/llfile.h

indra/llcommon/llpreprocessor.h

indra/llcommon/llprocessor.cpp

indra/llcommon/llsdserialize.cpp

indra/llcommon/llstring.h

indra/llcommon/llsys.cpp

indra/llcommon/u64.cpp

indra/llimage/llimage.cpp

indra/llimage/llimagebmp.cpp

indra/llimage/llimagedxt.cpp

indra/llimage/llimagejpeg.cpp

indra/llimage/llimagetga.cpp

indra/llinventory/llinventory.cpp

indra/llinventory/lllandmark.cpp

indra/llinventory/llnotecard.cpp