* Final sync with the trunk.

...applications/version-management/git-and-tools/default.nix

...ns/version-management/git-and-tools/git-annex/default.nix

...velopment/libraries/haskell/Crypto/class-constraints.diff

pkgs/development/libraries/haskell/Crypto/default.nix

...velopment/libraries/haskell/base64-bytestring/0.1.1.0.nix

...velopment/libraries/haskell/base64-bytestring/default.nix

pkgs/development/libraries/haskell/clientsession/default.nix

pkgs/development/libraries/haskell/xss-sanitize/default.nix

pkgs/tools/backup/btar/default.nix

pkgs/top-level/all-packages.nix

pkgs/top-level/haskell-packages.nix