Name: dm26566 Date: 12/12/2000


A prior conflict resolution introduced a second instance of the
the line:

  ifndef JDK_MINOR_VERSION
     JDK_MINOR_VERSION = 4
     JDK_MINOR_VERSION = 4
  endif

one of them should be deleted...

======================================================================