Merge branch 'akpm' (fixes from Andrew)