am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"

* commit '2d03a93ecf00fb43272364293a21f88720884ce2':
  Xcode 4.3 compatibility checkin