Ported changes in YaPI from SLE-11-SP3

The patch is already submitted in SLE-11-SP2, SP3.