merged stripdep change back to trunk
Authored by: rorthomas 2010-03-24
Parent: [r1293]
Child: [r1295]