Merge branch 'akpm' (Fixes from Andrew)