svn path=/nixos/trunk/; revision=9103
svn path=/nixos/trunk/; revision=9096
svn path=/nixos/trunk/; revision=9071