Trouble with MS 6.0 and two-field SLD labels

[jratike80]

The following part of SLD used to produce a two-part label "KOODI, NIMI_FI" (with comma and space between the parts) with Mapserver 5.2.1 and 5.6.5. With MS 6.0 the result is an error: msShapeGetAnnotation: Expression parser error. Failed to process text expression: "[KOODI]", "[NIMI_FI]"

<sld:TextSymbolizer>
<sld:Label>
<ogc:PropertyName>KOODI</ogc:PropertyName>, <ogc:PropertyName>NIMI_FI</ogc:PropertyName>
</sld:Label>
<sld:Font>
<sld:CssParameter name="font-family">Arial</sld:CssParameter>
<sld:CssParameter name="font-size">10</sld:CssParameter>
</sld:Font>
<sld:Fill>
<sld:CssParameter name="fill">#FF9900</sld:CssParameter>
</sld:Fill>
<sld:Halo>
<sld:Radius>
<ogc:Literal>3</ogc:Literal>
</sld:Radius><sld:Fill>
<sld:CssParameter name="fill">#FFFFFF</sld:CssParameter>
<sld:CssParameter name="fill-opacity">1</sld:CssParameter> 
</sld:Fill></sld:Halo>
</sld:TextSymbolizer>

The layer is very basic shapefile layer

LAYER
        NAME "f_areas"
        STATUS ON
        DATA "D:\Data\f_areas"
        TYPE POLYGON
        UNITS METERS
        SIZEUNITS PIXELS
        TOLERANCE 3
        TEMPLATE "d:/program files/ms4w/apps/template.html"
        TOLERANCEUNITS PIXELS
        METADATA
          "wms_title"    "f_area"
          "wms_srs" "EPSG:2393 EPSG:3067 EPSG:4326 EPSG:900913"
        END
         CLASS
         NAME "f_areas"
            STYLE
              OUTLINECOLOR 0 50 255
              WIDTH 2
            END
         END
        PROJECTION
          "init=epsg:2393" 
        END
  END    

MapServer 6.0 accepts the SLD if only one <ogc:PropertyName> is used for <sld:Label>