hg: jdk7/tl/jdk: 2 new changesets

[alan.bateman at oracle.com]

Changeset: 6bf403a14da4
Author:    alanb
Date:      2010-06-25 18:31 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/6bf403a14da4

6963828: TEST_BUG: java/nio/channels/FileTransfer.java takes too long (win)
Reviewed-by: chegar

! test/java/nio/channels/FileChannel/Transfer.java

Changeset: 0995c5a2dc6d
Author:    alanb
Date:      2010-06-25 18:34 +0100
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/0995c5a2dc6d

Merge