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

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