Automated merge with ssh://hg.lindenlab.com/james/gooey/
Automated merge with ssh://hg.lindenlab.com/james/gooey/

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