Michael, sorry for overriding your work but I want to maintain it... svn path=/nixpkgs/trunk/; revision=26058
svn path=/nixpkgs/trunk/; revision=25711