hg: openjfx/2.2/controls/rt: Fixing merge issue in ComboBoxBaseSkin.

[hang.vo at oracle.com]

Changeset: 870484734f75
Author:    jgiles
Date:      2012-03-22 11:19 +1300
URL:       http://hg.openjdk.java.net/openjfx/2.2/controls/rt/rev/870484734f75

Fixing merge issue in ComboBoxBaseSkin.

! javafx-ui-controls/src/com/sun/javafx/scene/control/skin/ComboBoxBaseSkin.java