Merge branch 'block-summary' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2