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

[maurizio.cimadamore at oracle.com]

Changeset: 54b02fa9f9d1
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-26 16:37 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/54b02fa9f9d1

Automatic merge with condy