without these two settings my USB dvb-t stick doesn't work
Revert Merge x-updates into master due to mesa bloat

See #490 discussion.

This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing
changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
sysvtools: fix symlink when withoutInitTools = false
Adding E-KRHyper theorem prover
sysklogd: Don't remove /dev/log when syslogd exits

This messes up systemd-journald.
Adding a KDE wrapper, to easily have KDE programs in nix-env.

Specially for those not running KDE.
kdewrapper: fixes in env vars
Adding pygobject3 (for bluez4).

bluez-simple-agent fails to work otherwise.
We discussed this a bit on #486, and this looks like the simplest way to
get bluez-simple-agent again.
Update Racket: patch by Karn Kallio
firefoxWrapper: Add libcanberra gtk module to firefox
Amarok: fix build against KDE 4.10
libbluedevil: update to 1.9.3
bluedevil: update to 1.3.1
KWebKitPart: new package
Typo in pcl meta
pakcs: update to version 1.11.2
libftdi: bump to version 0.20

Needed for openocd 0.7.0 (added in the next commit).

NOTE: There is also a libftdi 1.0 version, but openocd only needs 0.20
so I didn't bother. (libftdi 1.0 uses CMake build system and has lots of
changes.)
openocd: bump to version 0.7.0

OpenOCD 0.7.0 has grown a dependency on libusb1.
openocd: update homepage

The old one still works, but it redirects to the new one:
http://openocd.sourceforge.net/
Apparmor: update to 2.8.1