am a2e05ead: am 3e60e44f: Merge "Xcode 4.3 compatibility checkin"

* commit 'a2e05ead45f57030aa86a82bbaf891f28f7d5a58':
  Xcode 4.3 compatibility checkin