Merge "Use xcode 4.2"