Merge branch 'master' into systemd
wpa_supplicant: Update to 1.1
Merge remote-tracking branch 'upstream/master' into systemd

Conflicts:
	pkgs/tools/networking/network-manager/default.nix
NetworkManager: cooperate better with systemd
gnupg: Update to 1.4.13

CVE-2012-6085
Merge branch 'master' into systemd
Merge remote-tracking branch 'origin/master' into systemd
Merge remote-tracking branch 'origin/master' into systemd
Fix mit-scheme

These changes are necessary for me to use mit-scheme on i686 NixOS.
mit-scheme in the current state should be broken on x86_64 either and
these changes should fix, too. I however did not test this.
Update the tarball mirroring scripts
Merge branch 'master' into systemd
Handle more bad characters
tinc:  A VPN daemon with full mesh routing.
Lots of Perl package updates
Merge remote-tracking branch 'origin/master' into systemd
Fixed tinc license.
tinc: GPLv2+, not GPLv2.
Update nixUnstable
Add myself as (additional) maintainer to all python packages.
python-mrbob: add missing dependency