merge from tcmask trunk. to WZ trunk Rev 10986
Authored by: stivosaurus 2010-06-17
Parent: [r69]
Child: [r71]