updated the patch for bug 879799 for more macosx friendliness