hg: jdk6/jdk6/hotspot: OPENJDK6-23: Resolve merge issues in 8015614.

[gnu . andrew]

Changeset: c2e524f26e19
Author:    andrew
Date:      2013-12-03 07:15 +0000
URL:       http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/c2e524f26e19

OPENJDK6-23: Resolve merge issues in 8015614.
Reviewed-by: omajid

! make/windows/makefiles/compile.make