Merge branch 'master' of ssh://git.planet-lab.org/git/linux-2.6
authorS.Çağlar Onur <caglar@cs.princeton.edu>
Wed, 18 Aug 2010 18:37:14 +0000 (14:37 -0400)
committerS.Çağlar Onur <caglar@cs.princeton.edu>
Wed, 18 Aug 2010 18:37:14 +0000 (14:37 -0400)

Trivial merge