am 47e7ca09: am c1024ba2: Merge "Xcode 4.3 compatibility checkin"

* commit '47e7ca09cf520f0a31ee8a72f91716ce4e764408':
  Xcode 4.3 compatibility checkin