am f1e424a6: am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in"

* commit 'f1e424a63658eb15ba61ca2eb8f0df38733188fe':
  XCode 4.3+ compatibility check-in