hg: jdk7/tl/jdk: 2 new changesets

[alan.bateman at oracle.com]

Changeset: 2e0204644cf4
Author:    alanb
Date:      2010-11-18 19:16 +0000
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/2e0204644cf4

7000913: (bf) CharBuffer.wrap, slice, position, slice leads to CharBuffer with incorrect offser
Reviewed-by: forax

! src/share/classes/java/nio/StringCharBuffer.java
! test/java/nio/Buffer/StringCharBufferSliceTest.java

Changeset: fbd3395f973b
Author:    alanb
Date:      2010-11-18 19:17 +0000
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/fbd3395f973b

Merge

- src/share/classes/sun/net/httpserver/SelectorCache.java