Klaus M. Brantl - 2010-11-22

diff for resolve.c against current trunk