Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk

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