Updated to conform the current expected output
Authored by: hotzst 2010-03-21
Parent: [r3150]
Child: [r3152]
