merged with 2_1-merged-to-HEAD-2002-09-30