Propagated to 2.0 and updated workspace path
Authored by: hotzst 2010-03-21
Parent: [r3147]
Child: [r3149]