Merge branches 'akpm' and 'akpm-hotfixes' (patches from Andrew)