This patch should be merged to patch 2/8, but `git rebase' failed to
combine them together as a whole.  I sent this separately.

-- 
Yao (齐尧)