svn path=/nixos/trunk/; revision=22554
svn path=/nixos/trunk/; revision=21810
(patch by roconnor) svn path=/nixos/trunk/; revision=21795