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)
commit974066bcf04bd5b2e787602ecd11f3408c9d2066
tree41470453874e829cb48c267fd665ecf95ff182a7
parente3543cd5d5f1afb628dcaa67bf604893b7aacba3
parentf464e11c95ac03f00c555d4321d93f1b0aab9ded
Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
etc/defaults/rc.conf
etc/rc.d/Makefile