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

* commit '3da13457cfa46cf7d46b57c00f387c7c310b2dba':
  XCode 4.3+ compatibility check-in