Merge more cocoa changes from Andrew McGeachie Reviewed By: dreiss Test Plan: To be provided later by McGeachie. Compiler builds fine. Does not affect other libraries.