Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release.
Result of svn merge -r65183:65337 svn+ssh://svn/svn/linden/branches/python-shuffle into release.

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm