svn path=/nixos/trunk/; revision=13191
svn path=/nixos/trunk/; revision=12757
Test the new option style. svn path=/nixos/trunk/; revision=12742