David Guibert a45d06f7fb Merge commit 'f54c97b' into HEAD ... svn path=/nixpkgs/trunk/; revision=25768		2011-02-02 20:05:47 +00:00
..
default.nix	Merge commit 'f54c97b' into HEAD	2011-02-02 20:05:47 +00:00