/hg/release/icedtea7-forest-2.4/jdk: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 5068c5bade1d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5068c5bade1d
author: andrew
date: Fri Sep 06 18:08:01 2013 +0100

	Removed tag icedtea-2.4.2


changeset e4526d518dac in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=e4526d518dac
author: andrew
date: Fri Sep 06 21:36:31 2013 +0100

	Correct error resulting from IcedTea 1.x hack.


changeset 1320dcac2e08 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1320dcac2e08
author: andrew
date: Fri Sep 06 21:36:36 2013 +0100

	Added tag icedtea-2.4.2 for changeset e4526d518dac


diffstat:

 .hgtags                                           |  4 ++++
 src/share/native/sun/awt/image/jpeg/imageioJPEG.c |  2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 394e5408306c -r 1320dcac2e08 .hgtags
--- a/.hgtags	Fri Sep 06 12:45:50 2013 +0100
+++ b/.hgtags	Fri Sep 06 21:36:36 2013 +0100
@@ -353,3 +353,7 @@
 fb25cdef17e9610db5cb89fc35c0c4abef5ad781 jdk7u40-b43
 ed444a09a5fd32237deaef6e43804e20ba4f6352 jdk7u40-b60
 e2cdb919c0eed11b1603711bcb066a9bac79709d icedtea-2.4.2
+e2cdb919c0eed11b1603711bcb066a9bac79709d icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+0000000000000000000000000000000000000000 icedtea-2.4.2
+e4526d518dacc59adc253c7a6f49a79441d4e3d9 icedtea-2.4.2
diff -r 394e5408306c -r 1320dcac2e08 src/share/native/sun/awt/image/jpeg/imageioJPEG.c
--- a/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Fri Sep 06 12:45:50 2013 +0100
+++ b/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Fri Sep 06 21:36:36 2013 +0100
@@ -1509,7 +1509,7 @@
 
     // Set up to keep any APP2 markers, as these might contain ICC profile
     // data
-    jpegsavemarkers(cinfo, JPEG_APP1, 0xFFFF);
+    jpeg_save_markers(cinfo, JPEG_APP1, 0xFFFF);
     jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF);
 
     /*