Merge branch 'patches_cel-for-2.6.32' into nfs-for-2.6.32