svn path=/nixos/trunk/; revision=17792
* Renamed some of the new Grub options to more sensible names (e.g. extraGrubEntries to extraEntries, bootMount to bootDevice, etc.). svn path=/nixos/trunk/; revision=17494
svn path=/nixos/branches/modular-nixos/; revision=15722