Build 5691
SVN-
Revert part of r5655 that wiped out my cast-qual fixes from r5551.
SVN handles and Git names are merged into one person.
Revert part of r5655 that wiped out my cast-qual fixes from r5551.
fix warnings when compiling on Linux
fix errors when compiling on Linux