svn path=/nixos/trunk/; revision=7707
svn path=/nixos/trunk/; revision=7705
svn path=/nixos/trunk/; revision=7585