am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"

* commit 'fc4215eec9b947628c3ab5b3707711d16da19120':
  Xcode 4.3 compatibility checkin