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

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