Merge branch '32' of ssh://git.planet-lab.org/git/linux-2.6 into 32
Sapan Bhatia [Tue, 1 May 2012 16:21:13 +0000 (12:21 -0400)]

Trivial merge