# HG changeset patch
# User mduigou
# Date 1300392869 25200
# Node ID 7047ae9625425b9efc98b28f8f79b0f52308b5bb
# Parent  e658ae923d534b211342d716e20a080b4819acf3# Parent  99032bb1a2b90566ef47fc045b018c975609df69
Merge

diff -r 99032bb1a2b9 -r 7047ae962542 jdk/src/share/classes/java/util/JumboEnumSet.java
--- a/jdk/src/share/classes/java/util/JumboEnumSet.java	Thu Mar 17 11:42:39 2011 -0700
+++ b/jdk/src/share/classes/java/util/JumboEnumSet.java	Thu Mar 17 13:14:29 2011 -0700
@@ -34,6 +34,8 @@
  * @serial exclude
  */
 class JumboEnumSet<E extends Enum<E>> extends EnumSet<E> {
+    private static final long serialVersionUID = 334349849919042784L;
+
     /**
      * Bit vector representation of this set.  The ith bit of the jth
      * element of this array represents the  presence of universe[64*j +i]
diff -r 99032bb1a2b9 -r 7047ae962542 jdk/src/share/classes/java/util/RegularEnumSet.java
--- a/jdk/src/share/classes/java/util/RegularEnumSet.java	Thu Mar 17 11:42:39 2011 -0700
+++ b/jdk/src/share/classes/java/util/RegularEnumSet.java	Thu Mar 17 13:14:29 2011 -0700
@@ -34,6 +34,7 @@
  * @serial exclude
  */
 class RegularEnumSet<E extends Enum<E>> extends EnumSet<E> {
+    private static final long serialVersionUID = 3411599620347842686L;
     /**
      * Bit vector representation of this set.  The 2^k bit indicates the
      * presence of universe[k] in this set.