Automated merge with http://hg.secondlife.com/mesh-development
Automated merge with http://hg.secondlife.com/mesh-development

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