Merge trunk r4041,4042
This commit is contained in:
parent
4cd2611b21
commit
56a5508dcd
1 changed files with 1 additions and 1 deletions
|
@ -479,6 +479,7 @@ exit
|
||||||
</xsl:call-template>
|
</xsl:call-template>
|
||||||
</xsl:otherwise>
|
</xsl:otherwise>
|
||||||
</xsl:choose>
|
</xsl:choose>
|
||||||
|
<xsl:text>
</xsl:text>
|
||||||
</xsl:otherwise>
|
</xsl:otherwise>
|
||||||
</xsl:choose>
|
</xsl:choose>
|
||||||
</xsl:when>
|
</xsl:when>
|
||||||
|
@ -654,7 +655,6 @@ unset OLD_PKGDIR
|
||||||
</xsl:when>
|
</xsl:when>
|
||||||
<xsl:otherwise>
|
<xsl:otherwise>
|
||||||
<xsl:value-of select="$outputstring"/>
|
<xsl:value-of select="$outputstring"/>
|
||||||
<xsl:text>
</xsl:text>
|
|
||||||
</xsl:otherwise>
|
</xsl:otherwise>
|
||||||
</xsl:choose>
|
</xsl:choose>
|
||||||
</xsl:otherwise>
|
</xsl:otherwise>
|
||||||
|
|
Reference in a new issue