Against 2.6.20-rc2, first some cleanup, then a bug fix.

-- 
Guillaume