svn path=/nixos/branches/fix-style/; revision=13852
svn path=/nixos/branches/fix-style/; revision=13688