svn path=/nixpkgs/trunk/; revision=16656
svn path=/nixpkgs/trunk/; revision=15837
svn path=/nixpkgs/trunk/; revision=15148