merge to 0.4-1 (HEAD as of 2006-05-09