svn path=/nixos/trunk/; revision=7290
svn path=/nixos/trunk/; revision=7171
svn path=/nixos/trunk/; revision=7155