merge to HEAD as of 2006-08-21