Russell King 1237934865 +0000 committer Russell King 1237934865 +0000 Merge branch 'highmem' into devel D~`P'x