Back port main branch bugfix
Fix typoes
Authored by: cesarxzf 2011-06-04
Parent: [r1296]
Child: [r1298]