hg: amber/amber/corba: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 21513fc8d57d
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-23 12:50 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/21513fc8d57d

Automatic merge with default