merge to HEAD as of 2006-08-21

No match.