svn merge -r96049:96026 -r95956:95931 -r95867:95775 svn+ssh://svn/svn/linden/release

Reverting my changes to the package target. It subtly broke the windows build in a way I didn't want to try to fix in release. Will fix in another branch.