am 3e60e44f: Merge "Xcode 4.3 compatibility checkin"

* commit '3e60e44fae35febb9da905394698b21b45ad7301':
  Xcode 4.3 compatibility checkin