am c4aa4ff3: am 810b0d8b: Merge "Fix build problems with gcc-4.6.x."

* commit 'c4aa4ff3551873c2e87a8679994d1f41f9909b0b':
  Fix build problems with gcc-4.6.x.