Merge branch 'master' of ../net-2.6/