.gitignore
.gitignore
Get rid of Apple/MasterDetailObjC/MasterDetailObjC.xcodeproj/project.xcworkspace/xcuserdata/jazzman.xcuserdatad/UserInterfaceState.xcuserstate.
Merge branch 'xcode4-mrc' into xcode4-arc

Conflicts:
	Apple/MasterDetailObjC/MasterDetailObjC.xcodeproj/project.xcworkspace/xcuserdata/jazzman.xcuserdatad/UserInterfaceState.xcuserstate