ide merge + small fixes, everyone flying out of au, thus calm.. svn path=/dists/trunk/linux-2.6/; revision=10402