hg: lambda/lambda/langtools: Fix: inherited generic functional descriptors are merged incorrectly

[maurizio.cimadamore at oracle.com]

Changeset: 83f0baea37de
Author:    mcimadamore
Date:      2013-02-07 10:58 +0000
URL:       http://hg.openjdk.java.net/lambda/lambda/langtools/rev/83f0baea37de

Fix: inherited generic functional descriptors are merged incorrectly

! src/share/classes/com/sun/tools/javac/code/Types.java
+ test/tools/javac/lambda/LambdaConv25.java
+ test/tools/javac/lambda/LambdaConv25.out