(This is in fact currently broken.) svn path=/nixos/trunk/; revision=23398
svn path=/nixos/trunk/; revision=23396
svn path=/nixos/trunk/; revision=23395