svn path=/nixos/trunk/; revision=19264
svn path=/nixos/trunk/; revision=19263
is to merge test-nixos-install-from-cd so that we have a single testing framework. svn path=/nixos/trunk/; revision=19259