*** old/src/share/vm/runtime/arguments.cpp	Mon Feb 28 18:56:42 2011
--- new/src/share/vm/runtime/arguments.cpp	Mon Feb 28 18:56:42 2011

*** 2788,2801 ****
--- 2788,2797 ----
    TieredCompilation = false;
  #else
    if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) {
      FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1);
    }
    // Temporary disable bulk zeroing reduction with G1. See CR 6627983.
    if (UseG1GC) {
      FLAG_SET_DEFAULT(ReduceBulkZeroing, false);
    }
  #endif
  
    // If we are running in a headless jre, force java.awt.headless property
    // to be true unless the property has already been set.
    // Also allow the OS environment variable JAVA_AWT_HEADLESS to set headless state.