Lluís Batlle i Rossell 0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as ... it was before merging. svn path=/nixpkgs/branches/stdenv-updates/; revision=24876		2010-11-26 14:40:39 +00:00
..
default.nix	Updating from trunk - I hope I fixed the conflict around gettext - I left it as	2010-11-26 14:40:39 +00:00