am c1024ba2: Merge "Xcode 4.3 compatibility checkin"

* commit 'c1024ba2ef452987bce9a4bb20dfc388a9deec07':
  Xcode 4.3 compatibility checkin