hg: jdk6/jdk6/jdk: 2 new changesets

[kelly.ohair at oracle.com]

Changeset: 99af8bf29c24
Author:    ohair
Date:      2010-06-14 16:55 -0700
URL:       http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/99af8bf29c24

6931763: sanity checks broken with latest cygwin, newer egrep -i option problems
6960853: Cleanup makefiles, remove unused vars etc.
Reviewed-by: darcy

! make/common/shared/Defs-control.gmk
! make/common/shared/Defs-windows.gmk
! make/common/shared/Platform.gmk
! make/common/shared/Sanity-Settings.gmk
! make/common/shared/Sanity.gmk
! make/jdk_generic_profile.sh
! make/netbeans/README
! make/netbeans/world/README
! make/netbeans/world/build.xml
! test/Makefile

Changeset: 8dee7db9a7ef
Author:    ohair
Date:      2010-06-14 16:58 -0700
URL:       http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/8dee7db9a7ef

Merge