Previously done in r17621 and accidentally reverted in r17656. svn path=/dists/trunk/linux-2.6/; revision=17849