svn path=/nixos/branches/upstart-0.6/; revision=18602
svn path=/nixos/trunk/; revision=18436
svn path=/nixos/trunk/; revision=18431