svn merge -c-134040 . back-out my last commit - it fixed the build test, but the build still fails; I'll leave it alone...
svn merge -c-134040 .
back-out my last commit - it fixed the build test, but the build still fails; I'll leave it alone...

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