Lluís Batlle i Rossell 3f7751b9c2 Merging from trunk
svn path=/nixos/branches/stdenv-updates/; revision=25176
2010-12-17 14:59:04 +00:00
..
2009-09-10 13:53:31 +00:00
2010-12-17 07:33:20 +00:00