hg: jdk7/tl/jdk: 2 new changesets

[xueming.shen at oracle.com]

Changeset: 6df25b528926
Author:    sherman
Date:      2010-05-24 15:20 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/6df25b528926

4690407: JAR tool: option -i can't be combined with other options
Summary: -i can't combined with cxut, do sanity check on options
Reviewed-by: martin

! src/share/classes/sun/tools/jar/Main.java

Changeset: d1cf79e27365
Author:    sherman
Date:      2010-05-24 16:41 -0400
URL:       http://hg.openjdk.java.net/jdk7/tl/jdk/rev/d1cf79e27365

Merge