Merge
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 9b4264c..95f8b4a 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -76,3 +76,4 @@
e7f18db469a3e947b7096bfd12e87380e5a042cd jdk7-b99
b218a53ec7d3d42be61d31d6917a6c5c037b6f56 jdk7-b100
4193eaf5f1b82794c6a0fb1a8d11af43d1b1d611 jdk7-b101
+a136a51f5113da4dad3853b74a8536ab583ab112 jdk7-b102
diff --git a/corba/.hgtags b/corba/.hgtags
index af9a074..8131661 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -76,3 +76,4 @@
95db968660e7d87c345d5cf3dc2e3db037fb7220 jdk7-b99
a56d734a1e970e1a21a8f4feb13053e9a33674c7 jdk7-b100
86a239832646a74811695428984b6947c0bd6dc8 jdk7-b101
+78561a95779090b5106c8d0f1a75360a027ef087 jdk7-b102
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 578e970..3d13f93 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -106,3 +106,4 @@
ad1977f08c4d69162a0775fe3f9576b9fd521d10 jdk7-b100
6c3a919105b68c15b7db923ec9a00006e9560910 jdk7-b101
ad1977f08c4d69162a0775fe3f9576b9fd521d10 hs19-b03
+c5cadf1a07717955cf60dbaec16e35b529fd2cb0 jdk7-b102
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 8745dab..7aae73a 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -76,3 +76,4 @@
7ef8469021fbc824ac49d57c83a14b1bb08f1766 jdk7-b99
d524be5ef62e8b8cb890c59a5d2c19ef0ab50d45 jdk7-b100
17f62a566a2020fd908e77106ed885e0c4e7c14d jdk7-b101
+15573625af97d01c4e24549041cba7584da7fe88 jdk7-b102
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index c8b4c1e..f65a239 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -76,3 +76,4 @@
818366ce23d8919cafaa4db4c51605ee2a7c8eaf jdk7-b99
bd26d0ce0c3cb43e58a8e2770cc03f26d96ffe5c jdk7-b100
b55ce274490082712f5e002b38d2eed505ca863d jdk7-b101
+d8580443d1815d68e0035a0560634e50fa899288 jdk7-b102
diff --git a/jdk/.hgtags b/jdk/.hgtags
index a816bb9..986d991 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -76,3 +76,4 @@
2587c9f0b60dc3146b4247b8674ada456a643d6f jdk7-b99
820b4e843d5168370a3bf166d19751a3271d8575 jdk7-b100
d58354a69011f3d3354765fa3167567c4c4a9612 jdk7-b101
+13029a61b16bec06535d4f0aa98229b358684128 jdk7-b102
diff --git a/langtools/.hgtags b/langtools/.hgtags
index 2ce2570..f21369c 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -76,3 +76,4 @@
005bec70ca27239bdd4e6169b9b078507401aa72 jdk7-b99
d1d7595fa824925651f09b8ffcb86c9cf39807be jdk7-b100
20a8fe72ee7b673f59c319a5222fe0eebbd92082 jdk7-b101
+ff9c0a0bf7edf637a7dac5062b920924536ed79c jdk7-b102
diff --git a/make/sanity-rules.gmk b/make/sanity-rules.gmk
index 6a17a5b..1ab62f7 100644
--- a/make/sanity-rules.gmk
+++ b/make/sanity-rules.gmk
@@ -228,7 +228,7 @@
######################################################
alt_bootdir:
ifdef ALT_BOOTDIR
- @if [ `$(ECHO) $(subst \,/,$(ALT_BOOTDIR)) | $(EGREP) -ci '^([a-z]:)?/'` -ne 1 ]; then \
+ @if [ `$(ECHO) $(subst \,/,$(ALT_BOOTDIR)) | $(EGREP) -c '^([A-Za-z]:)?/'` -ne 1 ]; then \
$(ECHO) "ERROR: ALT_BOOTDIR must be an Absolute Path Name, \n" \
" not a Relative Path Name. \n" \
" The current value of ALT_BOOTDIR is \n" \
