am 84d13f37: Merge "Xcode 4.3 compatibility checkin"

* commit '84d13f373f031641743c4b08156529b8754a32a8':
  Xcode 4.3 compatibility checkin