Klaus M. Brantl - 2010-11-22

against current trunk-version import.c