Merge branch '32' of ssh://git.planet-lab.org/git/linux-2.6 into 32
Sapan Bhatia [Tue, 1 May 2012 15:54:10 +0000 (11:54 -0400)]
1  2 
kernel-2.6.spec

diff --cc kernel-2.6.spec
Simple merge