am 0f30dd0d: Merge "Fix warning compiling samples with clang3.1"

* commit '0f30dd0d198b9806239c366ae327f6b83bcdd396':
  Fix warning compiling samples with clang3.1