am aa7d994e: Merge "Fix san-sangeles warnings with clang 3.1"

* commit 'aa7d994e37a3e697048a46a94b0ba4894332c698':
  Fix san-sangeles warnings with clang 3.1