Lluís Batlle i Rossell 51d0ccdf3c Updating from trunk (to catch cron changes)
I had some merge problems with the system-tarball; I hope I've resolved them.


svn path=/nixos/branches/stdenv-updates/; revision=24201
2010-10-10 11:46:57 +00:00
..
2010-09-25 22:29:42 +00:00
2010-09-30 05:08:33 +00:00
2010-10-06 20:22:36 +00:00