Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Tue, 25 Aug 2009 16:06:57 +0000 (18:06 +0200)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Tue, 25 Aug 2009 16:06:57 +0000 (18:06 +0200)
1  2 
etc/defaults/rc.conf
etc/rc.d/Makefile

Simple merge
Simple merge