Merge branch 'master' of ssh://git.planet-lab.org/git/mkinitrd
S.Çağlar Onur [Mon, 21 Feb 2011 21:28:57 +0000 (16:28 -0500)]

Trivial merge