(Lots of commits for that larswm!) svn path=/nixpkgs/trunk/; revision=21759
svn path=/nixpkgs/trunk/; revision=21758
svn path=/nixpkgs/trunk/; revision=21757