7008713: diamond conversion of kerberos5 and security tools Reviewed-by: weijun

7005424: Resync java.util.concurrent classes with Dougs CVS - Jan 2011 Reviewed-by: dholmes, chegar, mduigou

7011095: revert diamond changes from 6880112 that occur in method args Reviewed-by: darcy, alanb

7000693: java.sql.Timestamp compareTo() issues using low values Reviewed-by: okutsu

7005608: diamond conversion of JCA and crypto providers Reviewed-by: wetmore

6544224: Remove the need of sun.reflect.misc Reviewed-by: alanb

7002957: (fc) FileChannel.transferTo fails to load libsendfile on Solaris 64-bit Reviewed-by: chegar

7008728: diamond conversion of basic security, permissions, authentication Reviewed-by: mullan

7009760: Possible stack corruption in Java_java_net_TwoStacksPlainSocketImpl_socketGetOption Summary: SOCKET_ADDRESS -> SOCKETADDRESS Reviewed-by: alanb

Merge

6993732: Remove the HPI Reviewed-by: ohair, lancea, chegar, mduigou, mchung, mr

7000511: PrintStream, PrintWriter, Formatter, Scanner leave files open when exception thrown Reviewed-by: alanb, mduigou

Merge

6735293: javax.swing.text.NavigationFilter.getNextVisualPositionFrom() not always throws BadLocationException Reviewed-by: peterz

Merge

6246816: SwingSet2 should be rewritten Reviewed-by: peterz

6342301: Bad interaction between setting the ui and file filters in JFileChooser Reviewed-by: alexp

6990651: Regression: NPE when refreshing applet since 6u22-b01 Reviewed-by: peterz

6589952: Swing: dead links in API documentation Reviewed-by: alexp

Merge

Merge

7011442: AppletClassLoader.java needs to avoid spurious wakeup Reviewed-by: anthony

7011443: ./share/classes/sun/awt/SunToolkit.java needs to avoid spurious wakeup Reviewed-by: anthony

7011446: ./windows/classes/sun/awt/windows/WToolkit.java needs to avoid spurious wakeup Reviewed-by: anthony