Eelco Dolstra 0d5ea86748 * Merge some stuff from the trunk.
svn path=/nixos/branches/modular-nixos/; revision=16051
2009-06-26 11:36:38 +00:00
..
2009-06-26 11:36:38 +00:00
2009-05-25 13:55:36 +00:00
2009-06-24 22:27:54 +00:00