Fix hardcoded paths in ztest
Merge remote-tracking branch 'upstream/master' into master_clean
Merge branch 'master_clean' of https://github.com/jcumming/nixpkgs into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
Merge remote-tracking branch 'upstream/master' into master_clean
zfs-0.6.0-rc14, spl-0.6.0-rc14
development/libraries/librdf/default.nix:
  Move librdf_raptor to propagatedBuildInputs.
qjackctl: Update to 0.3.9, --enable-jack-version
jackaudio/default.nix: Update to 1.9.9.5.
applications/audio/guitarix: New nixpkg.
firefoxWrapper: Fix Quake Live support.
Add fping, a more scriptable ping
nvidia-x11: Update to 310.32
for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work
Linux 3.0.62
Linux 3.4.29
Linux 3.7.6
pythonPackages.nose: Don't run tests on darwin.

Should fix NixOS/charon#77
Document deepSeq
haskell-contravariant: update to version 0.3