[Bugfix][Backport] Fix typos causing clang 3.3 to report an error.

Patch by Rene Milk.  Thanks!

[[Imported from SVN: r8931]]