Merge branch 't/auto-upd-grsec' into t/all
Merge branch 't/auto-upd-kernel' into t/all
Merge branch 't/grsec-fix-build' into t/all

Conflicts:
	pkgs/top-level/all-packages.nix
Merge branch 't/grsec-module' into t/all
Merge branch 't/grsec-wip' into t/all
Merge branch 't/grsecurity' into t/all
Merge branch 't/ipmiutil' into t/all
Merge branch 't/knetwalk' into t/all
Merge branch 't/memtest' into t/all
Merge branch 't/vimrc' into t/all
Merge branch 't/xfs' into t/all
Merge branch 't/zfs-autosnap' into t/all
Merge branch 't/zfs-import' into t/all

Conflicts:
	nixos/modules/tasks/filesystems/zfs.nix
Merge branch 't/zfstools' into t/all
nixUnstable: Update to 1.7pre3327_0e2ca26

The previous version (1.7pre3319_f4013b6) isn't available on hydra anymore.
ghc: Add support for grsecurity
grub: fix
hydra: Disable building nixos.ova, as it requires VirtualBox
add todo.txt
release.nix: Really disable OVA