QAR-1274 - Fixing trunk bug resulting from !.22 RC fix + featurettes 4 integration. svn merge -r112608 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-1274 to trunk.
QAR-1274 - Fixing trunk bug resulting from !.22 RC fix + featurettes 4 integration.
svn merge -r112608 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-1274
to trunk.

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