Merge "Fixed a copy and paste error" into gingerbread