patch from <lvyue> with little modifications

# HG changeset patch
# User Eike Rathke [er] <eike.rathke@oracle.com>
# Date 1291410557 -3600
# Node ID 297b5255c27a9fa541bed948d675bba1c4d87ab0
# Parent  ce99b09497844a0d893ab78cb15a2749fcc932bf