Patch by Rickard Nilsson. svn path=/nixos/trunk/; revision=29563
svn path=/nixos/trunk/; revision=29285
svn path=/nixos/branches/modular-nixos/; revision=15784