hg: jdk7/2d/jdk: 6962082: merge back in lines from bad merge in CR 6501644 and open up a test

[steven.loomis at sun.com]

Changeset: be2e229513a7
Author:    srl
Date:      2011-03-07 19:37 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/be2e229513a7

6962082: merge back in lines from bad merge in CR 6501644 and open up a test
Reviewed-by: igor, prr

! src/share/native/sun/font/layout/LayoutEngine.cpp
+ test/java/awt/font/TextLayout/CombiningPerf.java