Merge branch 'for-2.6.34' into for-2.6.35