am caa4a614: Merge "Xcode 4.3 compatibility checkin"

* commit 'caa4a614d192210a0f1f819499e71a8b6daacf0f':
  Xcode 4.3 compatibility checkin