hg: jdk7/tl/jdk: 7017176: Several JNDI tests are mssing GPL header

2011-02-04 Thread vincent . x . ryan
Changeset: 78fe1b7a9a1a
Author:vinnie
Date:  2011-02-04 09:52 +
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/78fe1b7a9a1a

7017176: Several JNDI tests are mssing GPL header
Reviewed-by: alanb

! test/com/sun/jndi/ldap/LdapName/Case.java
! test/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java
! test/com/sun/jndi/ldap/LdapName/UnescapeTest.java
! test/com/sun/jndi/ldap/ReadTimeoutTest.java



hg: jdk7/tl/jdk: 7014095: Broken link in java.sql package specification

2011-02-04 Thread lance . andersen
Changeset: 9599534b1727
Author:lancea
Date:  2011-02-04 09:07 -0500
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/9599534b1727

7014095: Broken link in java.sql package specification
Reviewed-by: alanb

! src/share/classes/java/sql/package.html



hg: jdk7/tl/jdk: 7015783: Update JDK Netbeans projects to -source 1.7

2011-02-04 Thread mike . duigou
Changeset: c5f953e920c6
Author:mduigou
Date:  2011-02-04 12:54 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/c5f953e920c6

7015783: Update JDK Netbeans projects to -source 1.7
Reviewed-by: darcy

! make/netbeans/common/java-data-native.ent
! make/netbeans/common/java-data-no-native.ent



hg: jdk7/tl/jdk: 7005986: (zipfs) ZipPath.startsWith() fails because of the implementation of getName(index)

2011-02-04 Thread xueming . shen
Changeset: b8662dac7c91
Author:sherman
Date:  2011-02-04 13:17 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/b8662dac7c91

7005986: (zipfs) ZipPath.startsWith() fails because of the implementation of 
getName(index)
Summary: Updated starsWith/endsWith to be consistent with default file system
Reviewed-by: alanb

! src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipPath.java
! test/demo/zipfs/PathOps.java
! test/demo/zipfs/basic.sh



hg: jdk7/tl: 12 new changesets

2011-02-04 Thread lana . steuck
Changeset: bd70f76b0309
Author:cl
Date:  2011-01-20 15:51 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/bd70f76b0309

Added tag jdk7-b126 for changeset b566d4909056

! .hgtags

Changeset: 6e0f4d6099bb
Author:cl
Date:  2011-01-27 17:28 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/6e0f4d6099bb

Added tag jdk7-b127 for changeset bd70f76b0309

! .hgtags

Changeset: 65e6601596e2
Author:lana
Date:  2011-01-24 13:21 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/65e6601596e2

Merge


Changeset: 61f181d43d9a
Author:lana
Date:  2011-01-28 10:00 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/61f181d43d9a

Merge


Changeset: 6db0e6f221bd
Author:ohair
Date:  2011-01-05 17:24 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/6db0e6f221bd

7009969: Remove SKIP_OPENJDK_BUILD from top Makefile
Reviewed-by: robilad

! Makefile
! make/Defs-internal.gmk

Changeset: 49c463695059
Author:ohair
Date:  2011-01-10 10:00 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/49c463695059

Merge


Changeset: 6d9bbcc0a8cb
Author:ohair
Date:  2011-01-13 17:55 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/6d9bbcc0a8cb

Merge


Changeset: 24900a58ab9f
Author:ohair
Date:  2011-01-14 14:04 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/24900a58ab9f

6950375: Remove msvcrt.dll from the Windows JRE bundles
Reviewed-by: prr

! Makefile
! README-builds.html

Changeset: 3a9f19cbf7f1
Author:ohair
Date:  2011-01-26 16:05 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/3a9f19cbf7f1

Merge


Changeset: a7a4f6db294d
Author:ohair
Date:  2011-01-27 18:43 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/a7a4f6db294d

Merge


Changeset: 57d702105b23
Author:ohair
Date:  2011-02-02 09:38 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/57d702105b23

Merge


Changeset: 904d7c7c44d9
Author:cl
Date:  2011-02-03 17:22 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/rev/904d7c7c44d9

Added tag jdk7-b128 for changeset 57d702105b23

! .hgtags



hg: jdk7/tl/corba: 3 new changesets

2011-02-04 Thread lana . steuck
Changeset: 64775e83f4df
Author:cl
Date:  2011-01-20 15:52 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/corba/rev/64775e83f4df

Added tag jdk7-b126 for changeset d7532bcd3742

! .hgtags

Changeset: 9baa8f94a11d
Author:cl
Date:  2011-01-27 17:28 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/corba/rev/9baa8f94a11d

Added tag jdk7-b127 for changeset 64775e83f4df

! .hgtags

Changeset: 3ff9acc7cc06
Author:cl
Date:  2011-02-03 17:22 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/corba/rev/3ff9acc7cc06

Added tag jdk7-b128 for changeset 9baa8f94a11d

! .hgtags



hg: jdk7/tl/hotspot: 52 new changesets

2011-02-04 Thread lana . steuck
Changeset: 102466e70deb
Author:cl
Date:  2011-01-20 15:52 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/102466e70deb

Added tag jdk7-b126 for changeset 4c851c931d00

! .hgtags

Changeset: 907c1aed0f8c
Author:cl
Date:  2011-01-27 17:28 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/907c1aed0f8c

Added tag jdk7-b127 for changeset 102466e70deb

! .hgtags

Changeset: e4f8c88cf6f0
Author:trims
Date:  2011-01-13 22:49 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/e4f8c88cf6f0

Added tag hs20-b06 for changeset e24ab3fa6aaf

! .hgtags

Changeset: 76d6282dcfe5
Author:trims
Date:  2011-01-13 22:53 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/76d6282dcfe5

7012348: Bump the HS20 build number to 07
Summary: Update the HS20 build number to 07
Reviewed-by: jcoomes

! make/hotspot_version

Changeset: 55f868e91c3b
Author:iveresov
Date:  2011-01-06 16:03 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/55f868e91c3b

7010618: C1: array length should be treated at int on 64bit during array 
allocation
Summary: Sign-extend the length argument during array allocation
Reviewed-by: never, kvn

! src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
! src/cpu/x86/vm/c1_LIRAssembler_x86.cpp

Changeset: 0e52ef6e94d3
Author:twisti
Date:  2011-01-07 03:58 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/0e52ef6e94d3

Merge


Changeset: 4fc084dac61e
Author:kvn
Date:  2011-01-07 10:16 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/4fc084dac61e

7009756: volatile variables could be broken throw reflection API
Summary: Use Atomic::load() and Atomic::store() to access a volatile long.
Reviewed-by: iveresov, jrose, dholmes, never

! src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp
! src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp
! src/os_cpu/linux_x86/vm/linux_x86_32.s
! src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp
! src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
! src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp
! src/os_cpu/solaris_x86/vm/solaris_x86_32.il
! src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp
! src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp
! src/share/vm/prims/unsafe.cpp

Changeset: 78e248949382
Author:kvn
Date:  2011-01-07 11:53 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/78e248949382

6876037: CTW fails jdk7/hotspot/src/share/vm/opto/type.cpp:2055. 
assert(bits,"Use TypePtr for NULL")
Summary: Add missing 0 value check in TypeRawPtr::add_offset().
Reviewed-by: never

! src/share/vm/opto/type.cpp

Changeset: d810e9a3fc33
Author:twisti
Date:  2011-01-10 00:56 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/d810e9a3fc33

7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) 
failed: init'd to NULL
Reviewed-by: never

! src/cpu/sparc/vm/methodHandles_sparc.cpp
! src/cpu/x86/vm/methodHandles_x86.cpp
! src/share/vm/prims/methodHandles.cpp
! src/share/vm/prims/methodHandles.hpp

Changeset: 70427f06ea47
Author:twisti
Date:  2011-01-10 03:58 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/70427f06ea47

7010913: JSR 292 ciMethodHandle does not handle MethodHandleCompiler exceptions 
properly
Reviewed-by: kvn, never

! src/share/vm/ci/ciMethodHandle.cpp
! src/share/vm/prims/methodHandleWalk.cpp

Changeset: dd031b2226de
Author:iveresov
Date:  2011-01-10 18:46 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/dd031b2226de

4930919: race condition in MDO creation at back branch locations
Summary: Reuse set_method_data_for_bcp() to setup mdp after MDO creation.
Reviewed-by: kvn, never

! src/cpu/sparc/vm/interp_masm_sparc.cpp
! src/cpu/sparc/vm/interp_masm_sparc.hpp
! src/cpu/sparc/vm/templateInterpreter_sparc.cpp
! src/cpu/sparc/vm/templateTable_sparc.cpp
! src/cpu/x86/vm/interp_masm_x86_32.cpp
! src/cpu/x86/vm/interp_masm_x86_64.cpp
! src/cpu/x86/vm/templateInterpreter_x86_32.cpp
! src/cpu/x86/vm/templateInterpreter_x86_64.cpp
! src/cpu/x86/vm/templateTable_x86_32.cpp
! src/cpu/x86/vm/templateTable_x86_64.cpp
! src/share/vm/interpreter/interpreterRuntime.cpp
! src/share/vm/interpreter/interpreterRuntime.hpp

Changeset: d4fca0a6abde
Author:kvn
Date:  2011-01-11 20:26 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/d4fca0a6abde

7011386: race in objArrayKlass::array_klass_impl
Summary: Move _lower_dimension field initialization before _higher_dimension 
and add storestore barrier.
Reviewed-by: dholmes, iveresov, never

! src/share/vm/oops/arrayKlass.hpp
! src/share/vm/oops/objArrayKlass.cpp
! src/share/vm/oops/typeArrayKlass.cpp
! src/share/vm/runtime/vmStructs.cpp

Changeset: bb8e3b66bde6
Author:twisti
Date:  2011-01-13 07:20 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/bb8e3b66bde6

Merge

! src/cpu/sparc/vm/templateTable_sparc.cpp
! src/c

hg: jdk7/tl/jaxp: 3 new changesets

2011-02-04 Thread lana . steuck
Changeset: c532d6dbc8d1
Author:cl
Date:  2011-01-20 15:52 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/c532d6dbc8d1

Added tag jdk7-b126 for changeset 2fde639439c1

! .hgtags

Changeset: a42c6132c746
Author:cl
Date:  2011-01-27 17:28 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/a42c6132c746

Added tag jdk7-b127 for changeset c532d6dbc8d1

! .hgtags

Changeset: f5b60c5a310f
Author:cl
Date:  2011-02-03 17:22 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/f5b60c5a310f

Added tag jdk7-b128 for changeset a42c6132c746

! .hgtags



hg: jdk7/tl/jaxws: 3 new changesets

2011-02-04 Thread lana . steuck
Changeset: ef19f173578c
Author:cl
Date:  2011-01-20 15:52 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxws/rev/ef19f173578c

Added tag jdk7-b126 for changeset 6d772c5119d5

! .hgtags

Changeset: 88d74afc5593
Author:cl
Date:  2011-01-27 17:28 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxws/rev/88d74afc5593

Added tag jdk7-b127 for changeset ef19f173578c

! .hgtags

Changeset: 0f7b39ad9024
Author:cl
Date:  2011-02-03 17:22 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxws/rev/0f7b39ad9024

Added tag jdk7-b128 for changeset 88d74afc5593

! .hgtags



hg: jdk7/tl/jdk: 55 new changesets

2011-02-04 Thread lana . steuck
Changeset: 29e09de1d0b4
Author:cl
Date:  2011-01-20 15:52 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/29e09de1d0b4

Added tag jdk7-b126 for changeset 8361ef97a0f9

! .hgtags

Changeset: 66c86ca4079a
Author:cl
Date:  2011-01-27 17:28 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/66c86ca4079a

Added tag jdk7-b127 for changeset 29e09de1d0b4

! .hgtags

Changeset: 63f5c7704faa
Author:prr
Date:  2011-01-12 15:58 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/63f5c7704faa

6958221: java.awt.Font.getFamily() leads to JVM crash on Linux on JDK7 for 
"custom" fonts
Reviewed-by: igor, jgodinez

! make/sun/awt/mapfile-mawt-vers
! make/sun/awt/mapfile-vers-linux
! make/sun/headless/mapfile-vers
! make/sun/xawt/mapfile-vers
! src/solaris/classes/sun/awt/X11FontManager.java
! src/solaris/classes/sun/awt/motif/MToolkit.java
! src/solaris/native/sun/awt/fontpath.c
+ test/java/awt/FontClass/X11FontPathCrashTest.java

Changeset: 5aae8b3162d0
Author:prr
Date:  2011-01-13 10:36 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/5aae8b3162d0

7001056: JDK 7 fails on to build on Solaris 10 update 9 - updated Xrender 
header files
Reviewed-by: igor, jgodinez

! make/sun/xawt/Makefile
! src/solaris/native/sun/java2d/x11/XRBackendNative.c

Changeset: 76b8fa7fd229
Author:prr
Date:  2011-01-13 12:08 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/76b8fa7fd229

7012269: mapfile for headless awt needs getFontPathNative defined
Reviewed-by: igor

! make/sun/headless/mapfile-vers

Changeset: 9f3f38c150b5
Author:prr
Date:  2011-01-13 14:11 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/9f3f38c150b5

6917884: NPE in sun.font.FcFontConfiguration.getPlatformFontNames
Reviewed-by: igor, jgodinez

! src/solaris/classes/sun/font/FontConfigManager.java

Changeset: 987aeabbfda3
Author:prr
Date:  2011-01-14 11:05 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/987aeabbfda3

6951086: Excessive Local References in sun.font.SunLayoutEngine.nativeLayout
Reviewed-by: igor, jgodinez

! src/share/native/sun/font/FontInstanceAdapter.cpp

Changeset: 646c3cf1ba37
Author:prr
Date:  2011-01-14 11:43 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/646c3cf1ba37

6989370: Windows platform fonts may be incorrectly marked as ineligible for the 
native rasteriser
Reviewed-by: igor, jgodinez

! src/share/classes/sun/font/SunFontManager.java
! src/windows/classes/sun/awt/Win32FontManager.java

Changeset: 5cb6bb816a34
Author:prr
Date:  2011-01-14 12:10 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/5cb6bb816a34

6925760: Scaled graphics can cause overlapped LCD mode strings on Windows for 
pixel size > 48
Reviewed-by: igor, jgodinez

! src/share/classes/sun/font/FileFontStrike.java
+ test/java/awt/FontClass/LCDScale.java

Changeset: 8b33567d68b0
Author:jgodinez
Date:  2011-01-14 14:25 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/8b33567d68b0

6939417: ArrayIndexOutOfBoundsException in Win 7 on selected printers
Reviewed-by: igor, prr

! src/windows/classes/sun/print/Win32PrintService.java
! test/javax/print/DialogMargins.java

Changeset: c2fcb5530ba5
Author:prr
Date:  2011-01-14 15:07 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/c2fcb5530ba5

6930980: Disable TrueType hinting for fonts known not to hint well
Reviewed-by: igor, jgodinez

! src/share/classes/sun/font/FileFontStrike.java
! src/share/classes/sun/font/FontScaler.java
! src/share/classes/sun/font/FreetypeFontScaler.java
! src/share/classes/sun/font/NullFontScaler.java

Changeset: 0bec5d506120
Author:dlila
Date:  2011-01-19 09:44 -0500
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/0bec5d506120

4724552: CubicCurve2D.contains(Rectangle2D) returns true when only partially 
contained.
Summary: Now using subdivision code in sun.awt.geom.Curve.
Reviewed-by: flar

! src/share/classes/java/awt/geom/CubicCurve2D.java

Changeset: c8a10bfd2fcb
Author:dlila
Date:  2011-01-19 11:31 -0500
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/c8a10bfd2fcb

4493128: CubicCurve2D intersects method fails
Summary: Now using subdivision code in sun.awt.geom.Curve.
Reviewed-by: flar

! src/share/classes/java/awt/geom/CubicCurve2D.java

Changeset: 00cc1c09c6dd
Author:prr
Date:  2011-01-19 09:22 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/00cc1c09c6dd

6951501: EUDC character is not displayed on Swing
Reviewed-by: igor, jgodinez

! src/windows/classes/sun/awt/Win32FontManager.java
! src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp

Changeset: e58e9e32399a
Author:prr
Date:  2011-01-19 17:02 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/e58e9e32399a

6983037: closed/java/awt/font/FontNames/Type1Fonts.java failed due to missed 
font
Reviewed-by: igor

! src/share/classes/sun/font/SunFontManager.java
! src/solaris/classes/sun/awt

hg: jdk7/tl/langtools: 6 new changesets

2011-02-04 Thread lana . steuck
Changeset: 1e6094c33187
Author:cl
Date:  2011-01-20 15:52 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/1e6094c33187

Added tag jdk7-b126 for changeset 438a8ad60f7a

! .hgtags

Changeset: d79e283c7d9b
Author:cl
Date:  2011-01-27 17:28 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/d79e283c7d9b

Added tag jdk7-b127 for changeset 1e6094c33187

! .hgtags

Changeset: 2314f2b07ae7
Author:lana
Date:  2011-01-24 13:25 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/2314f2b07ae7

Merge

- src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java
- 
src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
- 
src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
- 
src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
- src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
- src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
- test/tools/javac/diags/examples/EnumConstRequired.java
- test/tools/javac/diags/examples/TypeParameterOnPolymorphicSignature.java
- test/tools/javac/meth/InvokeDynTrans.out
- test/tools/javac/meth/InvokeMHTrans.java
- test/tools/javac/meth/InvokeMHTrans.out

Changeset: d7225b476a5d
Author:lana
Date:  2011-01-28 10:06 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/d7225b476a5d

Merge

- src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java
- 
src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
- 
src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
- 
src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
- src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
- src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
- test/tools/javac/diags/examples/EnumConstRequired.java
- test/tools/javac/diags/examples/TypeParameterOnPolymorphicSignature.java
- test/tools/javac/meth/InvokeDynTrans.out
- test/tools/javac/meth/InvokeMHTrans.java
- test/tools/javac/meth/InvokeMHTrans.out

Changeset: 1383d1ee8b5d
Author:cl
Date:  2011-02-03 17:22 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/1383d1ee8b5d

Added tag jdk7-b128 for changeset d7225b476a5d

! .hgtags

Changeset: 9e6a09375d37
Author:lana
Date:  2011-02-04 17:30 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/9e6a09375d37

Merge