Eelco Dolstra aa3ce13270 * Merged some trunk commits. ... svn path=/nixos/branches/modular-nixos/; revision=15860		2009-06-05 11:18:58 +00:00
..
cd-dvd	* Merged some trunk commits.	2009-06-05 11:18:58 +00:00